Re-integrate disc support, and add a configurable boot order

cubeboot/include/device.h

@@ -0,0 +1,6 @@
+#pragma once
+
+typedef enum {
+    device_disc_drive,
+    device_flippydrive
+} device_t;

cubeboot/source/main.c

@@ -319,6 +319,10 @@ int main(int argc, char **argv) {
     //     strcpy(cube_logo_ptr, settings.cube_logo);
     // }
 
+    set_patch_value(symshdr, syment, symstringdata, "boot_devices", (uintptr_t)&settings.boot_devices);
+    set_patch_value(symshdr, syment, symstringdata, "boot_devices_count", settings.boot_devices_count);
+    set_patch_value(symshdr, syment, symstringdata, "is_disc_drive_allowed", settings.allow_disc_drive);
+
     // Copy other variables
     set_patch_value(symshdr, syment, symstringdata, "is_running_dolphin", is_running_dolphin);
 

cubeboot/source/settings.c

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
+#include <ctype.h>
 
 #include "sd.h"
 #include "halt.h"
@@ -28,6 +29,64 @@ char *buttons_names[] = {
     "start", // START	0x1000
 };
 
+static void trim_string(const char **inout_string, u32 *inout_length) {
+    while (*inout_length > 0 && isspace((unsigned char)(*inout_string)[0])) {
+        // Trim leading whitespace
+        *inout_string += 1;
+        *inout_length -= 1;
+    }
+    while (*inout_length > 0 && isspace((unsigned char)(*inout_string)[*inout_length - 1])) {
+        // Trim trailing whitespace
+        *inout_length -= 1;
+    }
+}
+
+static bool get_device_from_string(const char *string, u32 length, device_t *out_device) {
+    trim_string(&string, &length);
+
+    if (strncmp("disc_drive", string, length) == 0) {
+        *out_device = device_disc_drive;
+        return true;
+    }
+    if (strncmp("flippydrive", string, length) == 0) {
+        *out_device = device_flippydrive;
+        return true;
+    }
+    return false;
+}
+
+static bool tokenise_string(const char **inout_string, u32 *inout_substring_length, const char *delimeters) {
+    bool has_found_any_delimeters = *inout_substring_length > 0;
+    if (has_found_any_delimeters) {
+        // Advance `string` to the next delimiter
+        *inout_string += *inout_substring_length;
+        *inout_substring_length = 0;
+    }
+
+    while (*inout_substring_length == 0) {
+        if ((*inout_string)[0] == '\0') {
+            // Reached the end of the input string
+            return false;
+        }
+
+        if (has_found_any_delimeters) {
+            // Advance beyond that delimiter
+            *inout_string += 1;
+        }
+        has_found_any_delimeters = true;
+
+        // Find the next delimiter, and therefore the length of the substring up to that delimiter
+        const char *delimeter_ptr = strpbrk(*inout_string, delimeters);
+        if (delimeter_ptr) {
+            *inout_substring_length = delimeter_ptr - *inout_string;
+        } else {
+            *inout_substring_length = strlen(*inout_string);
+        }
+    }
+
+    return true;
+}
+
 void load_settings() {
     memset(&settings, 0, sizeof(settings));
     int config_size = get_file_size("/config.ini");
@@ -160,6 +219,48 @@ void load_settings() {
         }
     }
 
+    // Boot order
+    settings.boot_devices_count = 0;
+    const char *remaining_boot_order = ini_get(conf, "cubeboot", "boot_order");
+    if (remaining_boot_order != NULL) {
+
+        u32 device_string_length = 0;
+        while (tokenise_string(&remaining_boot_order, &device_string_length, ",")) {
+            device_t found_device;
+            if (get_device_from_string(remaining_boot_order, device_string_length, &found_device)) {
+                bool already_in_boot_devices = false;
+                for (u32 i = 0; i < settings.boot_devices_count; i++) {
+                    already_in_boot_devices |= settings.boot_devices[i] == found_device;
+                }
+
+                if (!already_in_boot_devices) {
+                    settings.boot_devices[settings.boot_devices_count] = found_device;
+                    settings.boot_devices_count += 1;
+                } else {
+                    iprintf("Found duplicate boot device: %.*s\n", device_string_length, remaining_boot_order);
+                }
+            } else {
+                iprintf("Found unknown boot device: %.*s\n", device_string_length, remaining_boot_order);
+            }
+
+            if (settings.boot_devices_count >= MAX_BOOT_DEVICES) {
+                if (strlen(remaining_boot_order + device_string_length) > 0) {
+                    iprintf("Reached max boot devices (%d), skipping any remaining ones in config\n", MAX_BOOT_DEVICES);
+                }
+                break;
+            }
+        }
+    }
+
+    // allow_disc_drive
+    int allow_disc_drive = 0;
+    if (!ini_sget(conf, "cubeboot", "allow_disc_drive", "%d", &allow_disc_drive)) {
+        settings.allow_disc_drive = 1;
+    } else {
+        iprintf("Found allow_disc_drive = %d\n", allow_disc_drive);
+        settings.allow_disc_drive = allow_disc_drive;
+    }
+
     // menu grid type
     settings.menu_grid_type = MENU_GRID_SQUARE_ICONS;
     const char *menu_grid_type = ini_get(conf, "cubeboot", "menu_grid_type");

cubeboot/source/settings.h

@@ -1,8 +1,11 @@
 #include <gctypes.h>
 
 #include "const.h"
+#include "device.h"
 #include "settings_types.h"
 
+#define MAX_BOOT_DEVICES 8
+
 typedef struct settings {
     u32 cube_color;
     char *cube_logo;
@@ -15,6 +18,9 @@ typedef struct settings {
     u32 postboot_delay_ms;
     char *default_program;
     char *boot_buttons[MAX_BUTTONS];
+    device_t boot_devices[MAX_BOOT_DEVICES];
+    u32 boot_devices_count;
+    u32 allow_disc_drive;
     menu_grid_type_t menu_grid_type;
 } settings_t;
 

patches/Makefile

@@ -35,7 +35,7 @@ endif
 # options for code generation
 #---------------------------------------------------------------------------------
 
-CFLAGS		= -O2 -Wall -Wno-main -ffixed-r12 -ffixed-r13 -ffunction-sections -fdata-sections -Wno-unused-function -Werror-implicit-function-declaration $(MACHDEP) $(INCLUDE)
+CFLAGS		= -O2 -std=gnu23 -Wall -Wno-main -ffixed-r12 -ffixed-r13 -ffunction-sections -fdata-sections -Wno-unused-function -Werror-implicit-function-declaration $(MACHDEP) $(INCLUDE)
 CXXFLAGS	= $(CFLAGS)
 
 LINKER_SCRIPTS	:=
@@ -151,6 +151,14 @@ fake.o: patch.o
 	@echo $(notdir $<)
 	$(bin2o)
 
+#---------------------------------------------------------------------------------
+# This rule links in binary texture data with the .bti extension
+#---------------------------------------------------------------------------------
+%.bti.o	%_bti.h: %.bti
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	$(bin2o)
+
 -include $(DEPENDS)
 
 #---------------------------------------------------------------------------------

patches/include/device.h

@@ -0,0 +1 @@
+../../cubeboot/include/device.h

patches/linker/link_ntsc10.ld

@@ -1,5 +1,6 @@
 ntsc10_Jac_PlaySe = 0x813594e0;
 ntsc10_Jac_StopSoundAll = 0x81359640;
+ntsc10_Jac_PlayBgm = 0x81359680;
 ntsc10_PADSync = 0x81341074;
 ntsc10_OSDisableInterrupts = 0x813361b0;
 ntsc10___OSStopAudioSystem = 0x81333b88;
@@ -65,8 +66,11 @@ ntsc10_ptr_menu_blob = 0x8145d79c;
 ntsc10_ptr_game_blob_a = 0x8145d88c;
 ntsc10_ptr_game_blob_b = 0x8145d888;
 ntsc10_game_blob_text = 0x8148dd98;
+ntsc10_game_blob_insert_disc = 0x8148dda8;
+ntsc10_game_blob_reading_disc = 0x8148ddc8;
+ntsc10_game_blob_could_not_read_disc = 0x8148ddd8;
 
-ntsc10_prev_menu_id = 0x8145d710;
+ntsc10_next_menu_id = 0x8145d710;
 ntsc10_cur_menu_id = 0x8145d70c;
 ntsc10_uart_init = 0x8145dca8;
 
@@ -107,3 +111,17 @@ ntsc10_EXIImm = 0x81334d4c;
 ntsc10_EXIImmEx = 0x81334fa8;
 
 ntsc10_is_key_repeat = 0x81302ef8;
+
+ntsc10_stock_banner_ptr = 0x80af8440;
+
+ntsc10_get_element_alpha = 0x8130ab40;
+ntsc10_update_element_alpha = 0x8130aa58;
+ntsc10_banner_element_alpha = 0x8148dd88;
+ntsc10_top_level_banner_element_alpha = 0x81465c3c;
+
+ntsc10_cube_menu_rotation_vertical = 0x81465882;
+ntsc10_cube_menu_alpha = 0x81465888;
+
+ntsc10_draw_buttons = 0x813142ec;
+ntsc10_setup_buttons_matrix = 0x813031c8;
+ntsc10_update_button_alphas = 0x81311a98;