More palettes, more sample rates, bugfixes

* Add default FCEU palette and palettes from libretro. * Sound has 4 options: off, 11025Hz, 22050Hz, 44100Hz. * VS. UniSystem uses proper palette (default FCEU). * Button L3 "Insert Coin" (VS. UniSystem). * Fix memory usage when selecting palette.
infval · Apr 13, 2018 · d417703 · d417703
1 parent a6ce096
commit d417703
Show file tree

Hide file tree

Showing 8 changed files with 409 additions and 117 deletions.
diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@ FCEUmm-PS2
 
 [Download](https://github.com/infval/Fceumm-PS2/releases) binary release (ELF file).
 
+AKuHAK's [release notes](http://psx-scene.com/forums/f176/fceu-mm-ps2-new-version-118166/).
 ## Extra features
 * Multitap support up to 4 players
 * Separate turbo buttons
-
 ## Controls
 ### In-game
 
@@ -15,14 +15,14 @@ Action | Button | Action | Button | Action | Button
 B | ![Square](https://user-images.githubusercontent.com/38145742/38648065-120deeb8-3df8-11e8-984b-cccab8dd4622.png) | Select | ![Select](https://user-images.githubusercontent.com/38145742/38648134-65d593ca-3df8-11e8-9926-44357e5c44cd.png) | Start | ![Start](https://user-images.githubusercontent.com/38145742/38648145-717997d0-3df8-11e8-99b0-f98a75fc682b.png)
 A | ![Cross](https://user-images.githubusercontent.com/38145742/38648019-e30fd27a-3df7-11e8-8e6b-660cdf65b9f6.png) | Menu | ![L1](https://user-images.githubusercontent.com/38145742/38646430-9b548400-3df0-11e8-9158-e6d77afd2115.png) | `---` | ![R1](https://user-images.githubusercontent.com/38145742/38648091-2a2bbe76-3df8-11e8-9894-c53092ee8557.png)
 Turbo B | ![Triangle](https://user-images.githubusercontent.com/38145742/38646514-f0d0f2ec-3df0-11e8-9ff6-968a9f43ba9b.png) | Load State | ![L2](https://user-images.githubusercontent.com/38145742/38648101-3684328e-3df8-11e8-83b6-a17a6bb076a9.png) | Save State | ![R2](https://user-images.githubusercontent.com/38145742/38648109-4039008e-3df8-11e8-9171-1b6bacb38091.png)
-Turbo A | ![Circle](https://user-images.githubusercontent.com/38145742/38646507-eef3b536-3df0-11e8-8057-c4f8dd361eba.png) | FDS Disk Swap | ![L3](https://user-images.githubusercontent.com/38145742/38648117-4e97d3d0-3df8-11e8-9278-bc95530fad35.png) | FDS Side Swap | ![R3](https://user-images.githubusercontent.com/38145742/38648122-5b92778e-3df8-11e8-82ea-2eadfcd8764a.png)
+Turbo A | ![Circle](https://user-images.githubusercontent.com/38145742/38646507-eef3b536-3df0-11e8-8057-c4f8dd361eba.png) | FDS Disk Swap<br/>VS. Insert Coin | ![L3](https://user-images.githubusercontent.com/38145742/38648117-4e97d3d0-3df8-11e8-9278-bc95530fad35.png) | FDS Side Swap | ![R3](https://user-images.githubusercontent.com/38145742/38648122-5b92778e-3df8-11e8-82ea-2eadfcd8764a.png)
 
 D-pad: D-pad or Analog stick
 ### Browser
 
 Action | Button | Action | Button | Action | Button
 ------ | :----: | ------ | :----: | ------ | :----:
-`---` | ![Square](https://user-images.githubusercontent.com/38145742/38648065-120deeb8-3df8-11e8-984b-cccab8dd4622.png) | Options | ![Select](https://user-images.githubusercontent.com/38145742/38648134-65d593ca-3df8-11e8-9926-44357e5c44cd.png) | Confirm save path, center screen | ![Start](https://user-images.githubusercontent.com/38145742/38648145-717997d0-3df8-11e8-99b0-f98a75fc682b.png)
+`---` | ![Square](https://user-images.githubusercontent.com/38145742/38648065-120deeb8-3df8-11e8-984b-cccab8dd4622.png) | Options | ![Select](https://user-images.githubusercontent.com/38145742/38648134-65d593ca-3df8-11e8-9926-44357e5c44cd.png) | Confirm save path,<br/>center screen | ![Start](https://user-images.githubusercontent.com/38145742/38648145-717997d0-3df8-11e8-99b0-f98a75fc682b.png)
 `---` | ![Cross](https://user-images.githubusercontent.com/38145742/38648019-e30fd27a-3df7-11e8-8e6b-660cdf65b9f6.png) | Menu | ![L1](https://user-images.githubusercontent.com/38145742/38646430-9b548400-3df0-11e8-9158-e6d77afd2115.png) | `---` | ![R1](https://user-images.githubusercontent.com/38145742/38648091-2a2bbe76-3df8-11e8-9894-c53092ee8557.png)
 Back | ![Triangle](https://user-images.githubusercontent.com/38145742/38646514-f0d0f2ec-3df0-11e8-9ff6-968a9f43ba9b.png) | `---` | ![L2](https://user-images.githubusercontent.com/38145742/38648101-3684328e-3df8-11e8-83b6-a17a6bb076a9.png) | `---` | ![R2](https://user-images.githubusercontent.com/38145742/38648109-4039008e-3df8-11e8-9171-1b6bacb38091.png)
 OK | ![Circle](https://user-images.githubusercontent.com/38145742/38646507-eef3b536-3df0-11e8-8057-c4f8dd361eba.png) | `---` | ![L3](https://user-images.githubusercontent.com/38145742/38648117-4e97d3d0-3df8-11e8-9278-bc95530fad35.png) | `---` | ![R3](https://user-images.githubusercontent.com/38145742/38648122-5b92778e-3df8-11e8-82ea-2eadfcd8764a.png)

diff --git a/src/drivers/ps2/browser.c b/src/drivers/ps2/browser.c
@@ -46,7 +46,7 @@ char mpartitions[4][256];
 u16 history[20]; //20 levels should be enough
 u8 h = 0;
 
-extern int Browser_Menu(void);
+extern int Browser_Menu();
 
 static inline char* strzncpy(char *d, char *s, int l) { d[0] = 0; return strncat(d, s, l); }
 
@@ -624,7 +624,7 @@ char* Browser(int files_too, int menu_id)
         if(selection != oldselect) {
 
             gsKit_clear(gsGlobal,GS_SETREG_RGBAQ(0x00,0x00,0x00,0x80,0x00));
-            browser_primitive("FCEUltra PS2 B0.93 [x.2.0]","Browser", &BG_TEX, menu_x1, menu_y1, menu_x2, menu_y2);
+            browser_primitive("FCEUltra PS2 B0.93 [x.2.1]","Browser", &BG_TEX, menu_x1, menu_y1, menu_x2, menu_y2);
 
             if(selection > max_item) {
                 list_offset = text_line - (selection - max_item) * FONT_HEIGHT;

diff --git a/src/drivers/ps2/cnfsettings.c b/src/drivers/ps2/cnfsettings.c
@@ -583,7 +583,7 @@ void Save_Global_CNF(char *CNF_path_p)
 
 }  // Ends Save_Global_CNF
 
-void Default_Global_CNF(void)
+void Default_Global_CNF()
 {
     Settings.input_4p_adaptor = 0;
     Settings.current_palette  = 1;
@@ -623,7 +623,7 @@ void Default_Global_CNF(void)
     Settings.PlayerInput[0][4] = PAD_R3;
 }
 
-void Default_Skin_CNF(void)
+void Default_Skin_CNF()
 {
     FCEUSkin.frame     = GS_SETREG_RGBAQ(0xFF,0xFF,0xFF,0x80,0x00);
     FCEUSkin.textcolor = GS_SETREG_RGBAQ(0xFF,0xFF,0xFF,0x80,0x00);

diff --git a/src/drivers/ps2/init.c b/src/drivers/ps2/init.c
@@ -77,7 +77,7 @@ void poweroffps2(int i)
     poweroffShutdown();
 }
 
-void SetupGSKit(void)
+void SetupGSKit()
 {
     /* detect and set screentype */
     //gsGlobal = gsKit_init_global(GS_MODE_PAL);
@@ -107,7 +107,7 @@ void SetupGSKit(void)
 
 }
 
-void InitPS2(void)
+void InitPS2()
 {
     int i, sometime;
     static char hddarg[] = "-o" "\0" "4" "\0" "-n" "\0" "20";
@@ -174,7 +174,7 @@ printf("Failed to load module: cdInit2\n");
     mtapPortOpen(0);
 }
 
-void normalize_screen(void)
+void normalize_screen()
 {
     GS_SET_DISPLAY1(gsGlobal->StartX, // X position in the display area (in VCK unit
         gsGlobal->StartY,             // Y position in the display area (in Raster u
@@ -191,7 +191,7 @@ void normalize_screen(void)
         gsGlobal->DH - 1);            // Display area height
 }
 
-void init_custom_screen(void)
+void init_custom_screen()
 {
     //init real non-interlaced mode
     if(Settings.display) {