[develop] non-compliant Flashram saves

src/flashcart/64drive/64drive.c

@@ -309,6 +309,9 @@ static flashcart_err_t d64_set_save_type (flashcart_save_type_t save_type) {
         case FLASHCART_SAVE_TYPE_FLASHRAM_PKST2:
             type = (device_variant == DEVICE_VARIANT_A) ? SAVE_TYPE_FLASHRAM_PKST2 : SAVE_TYPE_FLASHRAM_1MBIT;
             break;
+        case FLASHCART_SAVE_TYPE_FLASHRAM_FAKE:
+            // NOTE: 64drive doesn't support the non-compliant FlashRam save type, Just thow an error.
+            return FLASHCART_ERR_ARGS;
         default:
             return FLASHCART_ERR_ARGS;
     }

src/flashcart/flashcart.h

@@ -45,6 +45,7 @@ typedef enum {
     FLASHCART_SAVE_TYPE_SRAM_1MBIT, /**< SRAM 1Mbit */
     FLASHCART_SAVE_TYPE_FLASHRAM_1MBIT, /**< FlashRAM 1Mbit */
     FLASHCART_SAVE_TYPE_FLASHRAM_PKST2, /**< FlashRAM PKST2 */
+    FLASHCART_SAVE_TYPE_FLASHRAM_FAKE, /**< Fake FlashRAM 1Mbit */
     __FLASHCART_SAVE_TYPE_END /**< End of save types */
 } flashcart_save_type_t;
 

src/flashcart/sc64/sc64.c

@@ -499,6 +499,7 @@ static flashcart_err_t sc64_load_save (char *save_path) {
         case SAVE_TYPE_FLASHRAM_1MBIT:
         case SAVE_TYPE_SRAM_BANKED:
         case SAVE_TYPE_SRAM_1MBIT:
+        case SAVE_TYPE_FLASHRAM_FAKE:
             address = (void *) (SRAM_FLASHRAM_ADDRESS);
             break;
         case SAVE_TYPE_NONE:
@@ -640,6 +641,9 @@ static flashcart_err_t sc64_set_save_type (flashcart_save_type_t save_type) {
         case FLASHCART_SAVE_TYPE_FLASHRAM_PKST2:
             type = SAVE_TYPE_FLASHRAM_1MBIT;
             break;
+        case FLASHCART_SAVE_TYPE_FLASHRAM_FAKE:
+            type = SAVE_TYPE_FLASHRAM_FAKE;
+            break;
         default:
             return FLASHCART_ERR_ARGS;
     }

src/flashcart/sc64/sc64_ll.h

@@ -81,7 +81,8 @@ typedef enum {
     SAVE_TYPE_SRAM_256KBIT, /**< SRAM 256Kbit */
     SAVE_TYPE_FLASHRAM_1MBIT, /**< FlashRAM 1Mbit */
     SAVE_TYPE_SRAM_BANKED, /**< SRAM Banked */
-    SAVE_TYPE_SRAM_1MBIT /**< SRAM 1Mbit */
+    SAVE_TYPE_SRAM_1MBIT, /**< SRAM 1Mbit */
+    SAVE_TYPE_FLASHRAM_FAKE /**< FlashRAM 1Mbit Non Compliant */
 } sc64_save_type_t;
 
 /** @brief The SC64 CIC Seed Enumeration. */

src/menu/cart_load.c

@@ -62,6 +62,7 @@ static flashcart_save_type_t convert_save_type (rom_save_type_t save_type) {
         case SAVE_TYPE_SRAM_1MBIT: return FLASHCART_SAVE_TYPE_SRAM_1MBIT;
         case SAVE_TYPE_FLASHRAM_1MBIT: return FLASHCART_SAVE_TYPE_FLASHRAM_1MBIT;
         case SAVE_TYPE_FLASHRAM_PKST2: return FLASHCART_SAVE_TYPE_FLASHRAM_PKST2;
+        case SAVE_TYPE_FLASHRAM_FAKE: return FLASHCART_SAVE_TYPE_FLASHRAM_FAKE;
         default: return FLASHCART_SAVE_TYPE_NONE;
     }
 }
@@ -233,13 +234,11 @@ cart_load_err_t cart_load_emulator (menu_t *menu, cart_load_emu_type_t emu_type,
             break;
         case CART_LOAD_EMU_TYPE_GAMEBOY:
             path_push(path, "gb.v64");
-            // TODO: Saves might be less problematic by using the FAKE type.
-            save_type = FLASHCART_SAVE_TYPE_FLASHRAM_1MBIT; //FLASHCART_SAVE_TYPE_FLASHRAM_FAKE;
+            save_type = FLASHCART_SAVE_TYPE_FLASHRAM_FAKE;
             break;
         case CART_LOAD_EMU_TYPE_GAMEBOY_COLOR:
             path_push(path, "gbc.v64");
-            // TODO: Saves might be less problematic by using the FAKE type.
-            save_type = FLASHCART_SAVE_TYPE_FLASHRAM_1MBIT; //FLASHCART_SAVE_TYPE_FLASHRAM_FAKE;
+            save_type = FLASHCART_SAVE_TYPE_FLASHRAM_FAKE;
             break;
         case CART_LOAD_EMU_TYPE_SEGA_GENERIC_8BIT:
             path_push(path, "smsPlus64.z64");

src/menu/rom_info.h

@@ -82,15 +82,17 @@ typedef enum {
 
 /** @brief ROM save type enumeration. */
 typedef enum {
-    SAVE_TYPE_NONE = 0,             /**< No expected save type */
-    SAVE_TYPE_EEPROM_4KBIT = 1,     /**< EEPROM 4Kbit */
-    SAVE_TYPE_EEPROM_16KBIT = 2,    /**< EEPROM 16Kbit */
-    SAVE_TYPE_SRAM_256KBIT = 3,     /**< SRAM 256Kbit */
-    SAVE_TYPE_SRAM_BANKED = 4,      /**< SRAM Banked */
-    SAVE_TYPE_SRAM_1MBIT = 5,       /**< SRAM 1Mbit */
-    SAVE_TYPE_FLASHRAM_1MBIT = 6,   /**< FlashRAM 1Mbit */
-    SAVE_TYPE_FLASHRAM_PKST2 = 7,   /**< FlashRAM PKST2 */
-    SAVE_TYPE_AUTOMATIC = -1,       /**< Automatic save type detection */
+    /** @brief There is no expected save type. */
+    SAVE_TYPE_NONE = 0,                     /**< No expected save type */
+    SAVE_TYPE_EEPROM_4KBIT = 1,             /**< EEPROM 4Kbit */
+    SAVE_TYPE_EEPROM_16KBIT = 2,            /**< EEPROM 16Kbit */
+    SAVE_TYPE_SRAM_256KBIT = 3,             /**< SRAM 256Kbit */
+    SAVE_TYPE_SRAM_BANKED = 4,              /**< SRAM Banked */
+    SAVE_TYPE_SRAM_1MBIT = 5,               /**< SRAM 1Mbit - Not a real save type, but used for some ROMs due to ED64 support. */
+    SAVE_TYPE_FLASHRAM_1MBIT = 6,           /**< FlashRAM 1Mbit */
+    SAVE_TYPE_FLASHRAM_PKST2 = 7,           /**< FlashRAM PKST2 */
+    SAVE_TYPE_FLASHRAM_FAKE = 8,            /**< Fake FlashRAM 1Mbit - Not a real save type, but used for some ROMs due to ED64 support. */
+    SAVE_TYPE_AUTOMATIC = -1,               /**< Automatic save type detection */
 } rom_save_type_t;
 
 /** @brief ROM TV type enumeration. */

src/menu/views/load_rom.c

@@ -81,6 +81,7 @@ static const char *format_rom_save_type (rom_save_type_t save_type, bool support
         case SAVE_TYPE_SRAM_1MBIT: return supports_cpak ?     "SRAM 1Mbit | Controller PAK" : "SRAM 1Mbit";
         case SAVE_TYPE_FLASHRAM_1MBIT: return supports_cpak ? "FlashRAM 1Mbit | Controller PAK" : "FlashRAM 1Mbit";
         case SAVE_TYPE_FLASHRAM_PKST2: return supports_cpak ? "FlashRAM (Pokemon Stadium 2) | Controller PAK" : "FlashRAM (Pokemon Stadium 2)";
+        case SAVE_TYPE_FLASHRAM_FAKE: return supports_cpak ? "FlashRAM (Wrongly implemented) | Controller PAK" : "FlashRAM (Wrongly implemented)";
         default: return "Unknown";
     }
 }
@@ -231,6 +232,7 @@ static component_context_menu_t set_save_type_context_menu = { .list = {
     { .text = "SRAM 768kbit / 3 banks", .action = set_save_type, .arg = (void *) (SAVE_TYPE_SRAM_BANKED) },
     { .text = "SRAM 1Mbit", .action = set_save_type, .arg = (void *) (SAVE_TYPE_SRAM_1MBIT) },
     { .text = "FlashRAM 1Mbit", .action = set_save_type, .arg = (void *) (SAVE_TYPE_FLASHRAM_1MBIT) },
+    { .text = "FlashRAM Non-compliant", .action = set_save_type, .arg = (void *) (SAVE_TYPE_FLASHRAM_FAKE) },
     COMPONENT_CONTEXT_MENU_LIST_END,
 }};