[SC64][SW] Server performance increase / USB save writeback / bootloa…

…der fixes (#37)

docs/02_usb_commands.md

@@ -20,6 +20,7 @@
 | `M` | **MEMORY_WRITE**       | address      | length       | data | ---              | Write data to specified memory address                        |
 | `U` | **USB_WRITE**          | type         | length       | data | N/A              | Send data to be received by app running on N64 (no response!) |
 | `D` | **DD_SET_BLOCK_READY** | success      | ---          | ---  | ---              | Notify flashcart about 64DD block readiness                   |
+| `W` | **WRITEBACK_ENABLE**   | ---          | ---          | ---  | ---              | Enable save writeback through USB packet                      |
 | `p` | **FLASH_WAIT_BUSY**    | wait         | ---          | ---  | erase_block_size | Wait until flash ready / Get flash block erase size           |
 | `P` | **FLASH_ERASE_BLOCK**  | address      | ---          | ---  | ---              | Start flash block erase                                       |
 | `f` | **FIRMWARE_BACKUP**    | address      | ---          | ---  | status/length    | Backup firmware to specified memory address                   |

docs/04_config_options.md

@@ -132,9 +132,10 @@ type: *enum* | default: `0`
 - `3` - SRAM 256 kib save is enabled
 - `4` - FlashRAM 1 Mib save is enabled
 - `5` - SRAM 768 kib save is enabled
+- `6` - SRAM 1 Mib save is enabled
 
 Use this setting for selecting save type that will be emulated. Only one save type can be enabled.
-Any successful write to this config will disable automatic save writeback to SD card when previously enabled.
+Any successful write to this config will disable automatic save writeback to USB or SD card when previously enabled.
 
 ---
 
@@ -158,10 +159,10 @@ type: *enum* | default: `3`
 - `0` - PAL TV type will be used
 - `1` - NTSC TV type will be used
 - `2` - MPAL TV type will be used
-- `3` - TV type will be autodetected
+- `3` - Console native TV type will be used
 
 Use this setting to force specific TV type.
-By setting value `3` bootloader will try to guess TV type from loaded ROM header.
+By setting value `3` bootloader will passthrough TV type native to the console.
 This setting is not used when **BOOT_MODE** is set to `3` or `4` (direct boot).
 
 ---

sw/bootloader/src/boot.c

@@ -37,33 +37,6 @@ static io32_t *boot_get_device_base (boot_info_t *info) {
     return device_base_address;
 }
 
-static bool boot_get_tv_type (boot_info_t *info) {
-    io32_t *base = boot_get_device_base(info);
-
-    char region = ((pi_io_read(&base[15]) >> 8) & 0xFF);
-
-    switch (region) {
-        case 'P':
-        case 'U':
-            info->tv_type = BOOT_TV_TYPE_PAL;
-            break;
-
-        case 'E':
-        case 'J':
-            info->tv_type = BOOT_TV_TYPE_NTSC;
-            break;
-
-        case 'B':
-            info->tv_type = BOOT_TV_TYPE_MPAL;
-            break;
-
-        default:
-            return false;
-    }
-
-    return true;
-}
-
 static bool boot_get_cic_seed (boot_info_t *info) {
     io32_t *base = boot_get_device_base(info);
 
@@ -83,11 +56,9 @@ static bool boot_get_cic_seed (boot_info_t *info) {
     return false;
 }
 
-void boot (boot_info_t *info, bool detect_tv_type, bool detect_cic_seed) {
-    if (detect_tv_type) {
-        if (!boot_get_tv_type(info)) {
-            info->tv_type = OS_INFO->tv_type;
-        }
+void boot (boot_info_t *info, bool detect_cic_seed) {
+    if (info->tv_type == BOOT_TV_TYPE_PASSTHROUGH) {
+        info->tv_type = OS_INFO->tv_type;
     }
 
     if (detect_cic_seed) {

sw/bootloader/src/boot.h

@@ -20,6 +20,7 @@ typedef enum {
     BOOT_TV_TYPE_PAL = 0,
     BOOT_TV_TYPE_NTSC = 1,
     BOOT_TV_TYPE_MPAL = 2,
+    BOOT_TV_TYPE_PASSTHROUGH = 3,
 } boot_tv_type_t;
 
 
@@ -31,7 +32,7 @@ typedef struct {
 } boot_info_t;
 
 
-void boot (boot_info_t *info, bool detect_tv_type, bool detect_cic_seed);
+void boot (boot_info_t *info, bool detect_cic_seed);
 
 
 #endif

sw/bootloader/src/display.c

@@ -13,18 +13,14 @@
 #define TEXT_COLOR              (0xFFFFFFFFUL)
 #define LINE_SPACING            (2)
 
+#define VI_CR                   (VI_CR_PIXEL_ADVANCE_1 | VI_CR_PIXEL_ADVANCE_0 | VI_CR_ANTIALIAS_1 | VI_CR_ANTIALIAS_0 | VI_CR_TYPE_32)
+
 
 static io32_t display_framebuffer[SCREEN_WIDTH * SCREEN_HEIGHT] __attribute__((section(".framebuffer, \"aw\", %nobits#")));
 static int char_x;
 static int char_y;
 static const vi_regs_t vi_config[] = {{
-    .CR = (
-        VI_CR_PIXEL_ADVANCE_1 |
-        VI_CR_PIXEL_ADVANCE_0 |
-        VI_CR_ANTIALIAS_1 |
-        VI_CR_ANTIALIAS_0 |
-        VI_CR_TYPE_32
-    ),
+    .CR = VI_CR,
     .H_WIDTH = SCREEN_WIDTH,
     .V_INTR = 0x000003FF,
     .CURR_LINE = 0x00000000,
@@ -38,13 +34,7 @@ static const vi_regs_t vi_config[] = {{
     .H_SCALE = 0x00000400,
     .V_SCALE = 0x00000400,
 }, {
-    .CR = (
-        VI_CR_PIXEL_ADVANCE_1 |
-        VI_CR_PIXEL_ADVANCE_0 |
-        VI_CR_ANTIALIAS_1 |
-        VI_CR_ANTIALIAS_0 |
-        VI_CR_TYPE_32
-    ),
+    .CR = VI_CR,
     .H_WIDTH = SCREEN_WIDTH,
     .V_INTR = 0x000003FF,
     .CURR_LINE = 0x00000000,
@@ -57,7 +47,21 @@ static const vi_regs_t vi_config[] = {{
     .COLOR_BURST = 0x000E0204,
     .H_SCALE = 0x00000400,
     .V_SCALE = 0x00000400,
-}};
+}, {
+    .CR = VI_CR,
+    .H_WIDTH = SCREEN_WIDTH,
+    .V_INTR = 0x000003FF,
+    .CURR_LINE = 0x00000000,
+    .TIMING = 0x04651E39,
+    .V_SYNC = 0x0000020D,
+    .H_SYNC = 0x00040C11,
+    .H_SYNC_LEAP = 0x0C190C1A,
+    .H_LIMITS = 0x006C02EC,
+    .V_LIMITS = 0x002501FF,
+    .COLOR_BURST = 0x000E0204,
+    .H_SCALE = 0x00000400,
+    .V_SCALE = 0x00000400,
+}};     
 
 
 static void display_decompress_background (uint32_t *background) {

sw/bootloader/src/main.c

@@ -30,14 +30,12 @@ void main (void) {
             break;
     }
 
-    bool detect_tv_type = (sc64_boot_info.tv_type == TV_TYPE_UNKNOWN);
-    bool detect_cic_seed = (sc64_boot_info.cic_seed == CIC_SEED_UNKNOWN);
-
     boot_info.reset_type = OS_INFO->reset_type;
     boot_info.tv_type = sc64_boot_info.tv_type;
     boot_info.cic_seed = (sc64_boot_info.cic_seed & 0xFF);
+    bool detect_cic_seed = (sc64_boot_info.cic_seed == CIC_SEED_AUTO);
 
     deinit();
 
-    boot(&boot_info, detect_tv_type, detect_cic_seed);
+    boot(&boot_info, detect_cic_seed);
 }

sw/bootloader/src/sc64.h

@@ -59,18 +59,19 @@ typedef enum {
     SAVE_TYPE_EEPROM_16K = 2,
     SAVE_TYPE_SRAM = 3,
     SAVE_TYPE_FLASHRAM = 4,
-    SAVE_TYPE_SRAM_BANKED = 5
+    SAVE_TYPE_SRAM_BANKED = 5,
+    SAVE_TYPE_SRAM_1M = 6
 } sc64_save_type_t;
 
 typedef enum {
-    CIC_SEED_UNKNOWN = 0xFFFF
+    CIC_SEED_AUTO = 0xFFFF
 } sc64_cic_seed_t;
 
 typedef enum {
     TV_TYPE_PAL = 0,
     TV_TYPE_NTSC = 1,
     TV_TYPE_MPAL = 2,
-    TV_TYPE_UNKNOWN = 3
+    TV_TYPE_PASSTHROUGH = 3
 } sc64_tv_type_t;
 
 typedef enum {

sw/controller/src/cfg.c

@@ -54,14 +54,14 @@ typedef enum {
 } boot_mode_t;
 
 typedef enum {
-    CIC_SEED_UNKNOWN = 0xFFFF
+    CIC_SEED_AUTO = 0xFFFF
 } cic_seed_t;
 
 typedef enum {
     TV_TYPE_PAL = 0,
     TV_TYPE_NTSC = 1,
     TV_TYPE_MPAL = 2,
-    TV_TYPE_UNKNOWN = 3
+    TV_TYPE_PASSTHROUGH = 3
 } tv_type_t;
 
 typedef enum {
@@ -210,6 +210,9 @@ static bool cfg_set_save_type (save_type_t save_type) {
         case SAVE_TYPE_SRAM_BANKED:
             cfg_change_scr_bits(CFG_SCR_SRAM_BANKED | CFG_SCR_SRAM_ENABLED, true);
             break;
+        case SAVE_TYPE_SRAM_1M:
+            cfg_change_scr_bits(CFG_SCR_SRAM_ENABLED, true);
+            break;
         default:
             save_type = SAVE_TYPE_NONE;
             break;
@@ -337,7 +340,7 @@ bool cfg_update (uint32_t *args) {
             p.cic_seed = (cic_seed_t) (args[1] & 0xFFFF);
             break;
         case CFG_ID_TV_TYPE:
-            if (args[1] > TV_TYPE_UNKNOWN) {
+            if (args[1] > TV_TYPE_PASSTHROUGH) {
                 return true;
             }
             p.tv_type = (tv_type_t) (args[1] & 0x03);
@@ -440,8 +443,8 @@ void cfg_reset_state (void) {
     dd_set_disk_state(DD_DISK_STATE_EJECTED);
     dd_set_sd_mode(false);
     isv_set_address(0);
-    p.cic_seed = CIC_SEED_UNKNOWN;
-    p.tv_type = TV_TYPE_UNKNOWN;
+    p.cic_seed = CIC_SEED_AUTO;
+    p.tv_type = TV_TYPE_PASSTHROUGH;
     p.boot_mode = BOOT_MODE_MENU;
 }
 
@@ -628,7 +631,7 @@ void cfg_process (void) {
                     return;
                 }
                 writeback_load_sector_table(args[0]);
-                writeback_enable();
+                writeback_enable(WRITEBACK_SD);
                 break;
 
             case 'K':

sw/controller/src/cfg.h

@@ -12,7 +12,8 @@ typedef enum {
     SAVE_TYPE_EEPROM_16K = 2,
     SAVE_TYPE_SRAM = 3,
     SAVE_TYPE_FLASHRAM = 4,
-    SAVE_TYPE_SRAM_BANKED = 5
+    SAVE_TYPE_SRAM_BANKED = 5,
+    SAVE_TYPE_SRAM_1M = 6,
 } save_type_t;
 
 

sw/controller/src/usb.c

@@ -8,6 +8,7 @@
 #include "update.h"
 #include "usb.h"
 #include "version.h"
+#include "writeback.h"
 
 
 #define BOOTLOADER_ADDRESS  (0x04E00000UL)
@@ -307,6 +308,12 @@ static void usb_rx_process (void) {
                 p.response_pending = true;
                 break;
 
+            case 'W':
+                writeback_enable(WRITEBACK_USB);
+                p.rx_state = RX_STATE_IDLE;
+                p.response_pending = true;
+                break;
+
             case 'p':
                 if (p.rx_args[0]) {
                     flash_wait_busy();

sw/controller/src/usb.h

@@ -11,6 +11,7 @@ typedef enum packet_cmd {
     PACKET_CMD_DD_REQUEST = 'D',
     PACKET_CMD_DEBUG_OUTPUT = 'U',
     PACKET_CMD_ISV_OUTPUT = 'I',
+    PACKET_CMD_SAVE_WRITEBACK = 'S',
     PACKET_CMD_UPDATE_STATUS = 'F',
 } usb_packet_cmd_e;