Fixed bug where combo saveram slot was written for non-base FPGA file…

…s. The bug could cause problems with special chip games - known cases only happen on mk3.
RedGuyyyy · Jun 30, 2019 · 9043321 · 9043321
1 parent 572a83e
commit 9043321
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/config-mk2 b/src/config-mk2
@@ -1,6 +1,6 @@
-CONFIG_VERSION="1.10.3-usb-v10"
-#CONFIG_FWVER = 0x810A030A
-CONFIG_FWVER=0x44534E53
+CONFIG_VERSION="1.10.3-usb-v11"
+CONFIG_FWVER = 0x810A030B
+#CONFIG_FWVER=0x44534E53
 #CONFIG_FWVER=0x010A0300
 CONFIG_MCU_FOSC = 12000000
 

diff --git a/src/config-mk3 b/src/config-mk3
@@ -1,6 +1,6 @@
-CONFIG_VERSION="1.10.3-usb-v10"
-#CONFIG_FWVER = 0x810A030A
-CONFIG_FWVER=0x33534E53
+CONFIG_VERSION="1.10.3-usb-v11"
+CONFIG_FWVER = 0x810A030B
+#CONFIG_FWVER=0x33534E53
 #CONFIG_FWVER=0x010A0300
 CONFIG_MCU_FOSC = 8000000
 

diff --git a/src/memory.c b/src/memory.c
@@ -327,9 +327,9 @@ uint32_t load_rom(uint8_t* filename, uint32_t base_addr, uint8_t flags) {
     }
     total_bytes_read += bytes_read;
     // FIXME: can we do this in the general (non-combo) case?
-    // FIXME: what does the condition below do that doubles romsize_bytes until it hits the file limit do?  Do some games
+    // FIXME: what does the condition below do that doubles romsize_bytes until it hits the file limit?  Do some games
     // misreport size?  Or is this for BSX?
-    if((flags & LOADROM_WITH_COMBO) && total_bytes_read >= romprops.romsize_bytes) break;
+    if((flags & LOADROM_WITH_COMBO) && (total_bytes_read >= romprops.romsize_bytes)) break;
   }
   uart_putc('\n');
   file_close();
@@ -402,7 +402,8 @@ uint32_t load_rom(uint8_t* filename, uint32_t base_addr, uint8_t flags) {
 
   printf("ramsize=%x ramslot=%hx rammask=%lx\nromsize=%x rommask=%lx\n", romprops.header.ramsize, ramslot, rammask, romprops.header.romsize, rommask);
   set_saveram_mask(rammask);
-  set_saveram_base(ramslot);
+  // don't set these for special chips as it may break from not supporting the feature
+  if (!romprops.fpga_conf || romprops.fpga_conf == FPGA_BASE) set_saveram_base(ramslot);
   set_rom_mask(rommask);
   readled(0);
 

diff --git a/src/snes.c b/src/snes.c
@@ -388,7 +388,6 @@ void snes_bootprint(void* msg) {
     fpga_rompgm();
     sram_writebyte(0, SRAM_CMD_ADDR);
     load_bootrle(SRAM_MENU_ADDR);
-    set_saveram_base(0x0);
     set_saveram_mask(0x1fff);
     set_rom_mask(0x3fffff);
     set_mapper(0x7);