Merge branch 'main' into ed64-basic

.github/workflows/build.yml

@@ -68,6 +68,27 @@ jobs:
           name: SC64
           path: ./output/sc64menu.n64
 
+      - name: Delete rolling-release tag and release
+        uses: dev-drprasad/delete-tag-and-release@v1.0
+        if: github.ref == 'refs/heads/main'
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: rolling-release
+
+      - name: Upload rolling release
+        uses: softprops/action-gh-release@v0.1.15
+        if: github.ref == 'refs/heads/main'
+        with:
+          name: Rolling release
+          body: Rolling release built from latest commit on `main` branch.
+          tag_name: rolling-release
+          files: |
+            ./output/N64FlashcartMenu.n64
+            ./output/menu.bin
+            ./output/OS64.v64
+            ./output/OS64P.v64
+            ./output/sc64menu.n64
+
   generate-docs:
     runs-on: ubuntu-latest
     permissions:
@@ -87,13 +108,3 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./output/docs
-
-# release-sc64-menu:
-#   runs-on: ubuntu-latest
-#   needs: minify-sc64-menu
-
-#   steps:
-#     - name: Generate release
-#       if: github.event_name == 'release' && github.event.action == 'created'
-#       run: |
-#         echo "still release preview. Check actions for build assets."

README.md

@@ -11,7 +11,7 @@ An open source menu for N64 flashcarts.
 
 ## Current (notable) menu features
 * Fully Open Source.
-* Loads all known N64 games (including iQue and byteswapped ROMs).
+* Loads all known N64 games (including iQue and Aleck64 ROMs (even if they are byteswapped)).
 * Emulator support (NES, SNES, GB, GBC) ROMs.
 * N64 ROM box image support.
 * Background image (PNG) support.

src/boot/boot.c

@@ -93,7 +93,7 @@ void boot (boot_params_t *params) {
     while (cpu_io_read(&SP->DMA_BUSY));
 
     cpu_io_write(&PI->SR, PI_SR_CLR_INTR | PI_SR_RESET);
-    while (cpu_io_read(&VI->CURR_LINE) != 2);
+    while ((cpu_io_read(&VI->CURR_LINE) & ~(VI_CURR_LINE_FIELD)) != 0);
     cpu_io_write(&VI->V_INTR, 0x3FF);
     cpu_io_write(&VI->H_LIMITS, 0);
     cpu_io_write(&VI->CURR_LINE, 0);

src/boot/boot_io.h

@@ -157,6 +157,8 @@ typedef struct {
 #define VI_CR_PIXEL_ADVANCE_3       (1 << 15)
 #define VI_CR_DITHER_FILTER_ON      (1 << 16)
 
+#define VI_CURR_LINE_FIELD          (1 << 0)
+
 
 typedef struct {
     io32_t MADDR;

src/boot/reboot.S

@@ -7,14 +7,15 @@
 #define RI_REFRESH          0x10
 #define RI_LATENCY          0x14
 
-#define RI_MODE_RESET       0x0000000C
+#define RI_MODE_RESET       0x00000000
 #define RI_MODE_STANDBY     0x0000000E
 
 #define RDRAM_RESET_DELAY   1024
+#define RDRAM_STANDBY_DELAY 512
 
 #define IPL3_ENTRY          0xA4000040
 
-
+.set noat
 .section .text.reboot, "ax", %progbits
 .type reboot, %object
 reboot_start:
@@ -22,7 +23,6 @@ reboot_start:
 
 # NOTE: CIC x105 requirement
 ipl2:
-.set noat
 .set noreorder
     lui $t5, 0xBFC0
 1:
@@ -34,30 +34,66 @@ ipl2:
     lw $t0, 0x24($t5)
     lui $t3, 0xB000
 .set reorder
-.set at
 
 reboot_entry:
     .equ reboot_entry_offset, ((. - reboot_start) / 4)
     .global reboot_entry_offset
 
+    bnez $s5, reset_rdram_skip
+
 reset_rdram:
     li $t0, RI_ADDRESS
 
     li $t1, RI_MODE_RESET
     sw $t1, RI_MODE($t0)
+
+    li $t2, RDRAM_RESET_DELAY
+1:
+    addiu $t2, (-1)
+    bnez $t2, 1b
+
     sw $zero, RI_CONFIG($t0)
     sw $zero, RI_CURRENT_LOAD($t0)
     sw $zero, RI_SELECT($t0)
     sw $zero, RI_REFRESH($t0)
 
-    li $t2, RDRAM_RESET_DELAY
-delay:
-    addiu $t2, $t2, (-1)
-    bnez $t2, delay
-
     li $t1, RI_MODE_STANDBY
     sw $t1, RI_MODE($t0)
 
+    li $t2, RDRAM_STANDBY_DELAY
+1:
+    addiu $t2, (-1)
+    bnez $t2, 1b
+reset_rdram_skip:
+
+    move $at, $zero
+    move $v0, $zero
+    move $v1, $zero
+    move $a0, $zero
+    move $a1, $zero
+    move $a2, $zero
+    move $a3, $zero
+    move $t0, $zero
+    move $t1, $zero
+    move $t2, $zero
+    move $t3, $zero
+    move $t4, $zero
+    move $t5, $zero
+    move $t6, $zero
+    move $t7, $zero
+    move $s0, $zero
+    move $s1, $zero
+    move $s2, $zero
+    move $t8, $zero
+    move $t9, $zero
+    move $k0, $zero
+    move $k1, $zero
+    move $gp, $zero
+    move $s8, $zero
+    move $ra, $zero
+
+    mtc0 $zero, $9
+
 run_ipl3:
     li $t3, IPL3_ENTRY
     jr $t3

src/menu/views/browser.c

@@ -168,11 +168,11 @@ static bool pop_directory (menu_t *menu) {
     return false;
 }
 
-void show_properties (menu_t *menu) {
+static void show_properties (menu_t *menu) {
     menu->next_mode = MENU_MODE_FILE_INFO;
 }
 
-void delete_entry (menu_t *menu) {
+static void delete_entry (menu_t *menu) {
     int selected = menu->browser.selected;
 
     path_t *path = path_clone_push(menu->browser.directory, menu->browser.entry->name);
@@ -206,10 +206,17 @@ void delete_entry (menu_t *menu) {
     menu->browser.entry = menu->browser.selected >= 0 ? &menu->browser.list[menu->browser.selected] : NULL;
 }
 
+static void set_default_directory (menu_t *menu) {
+    free(menu->settings.default_directory);
+    menu->settings.default_directory = strdup(strip_sd_prefix(path_get(menu->browser.directory)));
+    settings_save(&menu->settings);
+}
+
 static component_context_menu_t entry_context_menu = {
     .list = {
-        { .text = "Properties", .action = show_properties },
-        { .text = "Delete", .action = delete_entry },
+        { .text = "Show entry properties", .action = show_properties },
+        { .text = "Delete selected entry", .action = delete_entry },
+        { .text = "Set current directory as default", .action = set_default_directory },
         COMPONENT_CONTEXT_MENU_LIST_END,
     }
 };