From 888ce7cae80f9ae77aab7f033636e578889573b0 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Tue, 15 Apr 2025 09:18:13 -0400
Subject: [PATCH] disk:  Dump partition tables when we can't find a usable
 partition

Change-Id: I10a1b4f149657da4292f34ac8a14e58ec6cdcf72
---
 apps/main.c               | 20 ++++++++++++++------
 bootloader/common.c       | 12 ++++++++++--
 bootloader/ipod-s5l87xx.c |  9 ++++++++-
 bootloader/ipod.c         | 11 +++++++----
 bootloader/iriver_h1x0.c  |  7 +++++++
 bootloader/iriver_h300.c  |  7 +++++++
 6 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/apps/main.c b/apps/main.c
index 454ff907b8..c4faa23af2 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -636,16 +636,24 @@ static void init(void)
         CHART("<disk_mount_all");
         if (rc<=0)
         {
+            int line=0;
             lcd_clear_display();
-            lcd_puts(0, 0, "No partition");
-            lcd_putsf(0, 1, "found (%d).", rc);
+            lcd_putsf(0, line++, "No partition found (%d).", rc);
 #ifndef USB_NONE
-            lcd_puts(0, 2, "Insert USB cable");
-            lcd_puts(0, 3, "and fix it.");
+            lcd_puts(0, line++, "Insert USB cable");
+            lcd_puts(0, line++, "and fix it.");
 #elif !defined(DEBUG) && !(CONFIG_STORAGE & STORAGE_RAMDISK)
-            lcd_puts(0, 2, "Rebooting in 5s");
+            lcd_puts(0, line++, "Rebooting in 5s");
 #endif
-            lcd_puts(0, 4, rbversion);
+            lcd_puts(0, line++, rbversion);
+
+            struct partinfo pinfo;
+            for (int i = 0 ; i < NUM_VOLUMES ; i++) {
+                disk_partinfo(i, &pinfo);
+                if (pinfo.type)
+                    lcd_putsf(0, line++, "P%d T%02x S%08lx",
+                              i, pinfo.type, pinfo.size);
+            }
             lcd_update();
 
 #if defined(MAX_VIRT_SECTOR_SIZE) && defined(DEFAULT_VIRT_SECTOR_SIZE)
diff --git a/bootloader/common.c b/bootloader/common.c
index a79b1c4d64..d8f977b97b 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -43,6 +43,7 @@
 #else
 #include "rb-loader.h"
 #endif
+#include "disk.h"
 
 /* TODO: Other bootloaders need to be adjusted to set this variable to true
    on a button press - currently only the ipod, H10, Vibe 500, Sansa, and xDuoo x3 versions do. */
@@ -113,10 +114,17 @@ void error(int errortype, int error, bool shutdown)
         printf("ATA error: %d", error);
         break;
 
-    case EDISK:
+    case EDISK: {
+        struct partinfo pinfo;
         printf("No partition found");
+        for (int i = 0 ; i < NUM_VOLUMES ; i++) {
+            disk_partinfo(i, &pinfo);
+            if (pinfo.type)
+                printf("P%d T%02x S%08lx",
+                       i, pinfo.type, pinfo.size);
+        }
         break;
-
+    }
     case EBOOTFILE:
         printf(loader_strerror(error));
         break;
diff --git a/bootloader/ipod-s5l87xx.c b/bootloader/ipod-s5l87xx.c
index ed7287b552..f419c21ac6 100644
--- a/bootloader/ipod-s5l87xx.c
+++ b/bootloader/ipod-s5l87xx.c
@@ -476,7 +476,7 @@ static void run_of(void)
         printf("Booting OF in %d...", tmo);
         sleep(HZ*1);
     }
-    
+
     int rc = kernel_launch_onb();
     printf("Load OF error: %d", rc);
     sleep(HZ*10);
@@ -754,7 +754,14 @@ void main(void)
 
     rc = disk_mount_all();
     if (rc <= 0) {
+        struct partinfo pinfo;
         printf("No partition found");
+        for (int i = 0 ; i < NUM_VOLUMES ; i++) {
+            disk_partinfo(i, &pinfo);
+            if (pinfo.type)
+                printf("P%d T%02x S%08lx",
+                       i, pinfo.type, pinfo.size);
+        }
         fatal_error(ERR_RB);
     }
 
diff --git a/bootloader/ipod.c b/bootloader/ipod.c
index c7ea3ac340..229b9b4979 100644
--- a/bootloader/ipod.c
+++ b/bootloader/ipod.c
@@ -364,14 +364,17 @@ void* main(void)
     rc = disk_mount_all();
     if (rc<=0)
     {
+        for (int i = 0 ; i < NUM_VOLUMES ; i++) {
+            disk_partinfo(i, &pinfo);
+            if (pinfo.type)
+                printf("P%d T%02x S%08lx",
+                       i, pinfo.type, pinfo.size);
+        }
+
         printf("No partition found");
         fatal_error();
     }
 
-    disk_partinfo(1, &pinfo);
-    printf("Partition 1: 0x%02x %ld sectors",
-           pinfo.type, pinfo.size);
-
     if (button_was_held || (btn==BUTTON_MENU)) {
         /* If either the hold switch was on, or the Menu button was held, then
            try the Apple firmware */
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c
index faa76dc17d..502143ce58 100644
--- a/bootloader/iriver_h1x0.c
+++ b/bootloader/iriver_h1x0.c
@@ -561,8 +561,15 @@ void main(void)
     rc = disk_mount_all();
     if (rc<=0)
     {
+        struct partinfo pinfo;
         reset_screen();
         printf("No partition found");
+        for (int i = 0 ; i < NUM_VOLUMES ; i++) {
+            disk_partinfo(i, &pinfo);
+            if (pinfo.type)
+                printf("P%d T%02x S%08lx",
+                       i, pinfo.type, pinfo.size);
+        }
         while(button_get(true) != SYS_USB_CONNECTED) {};
     }
 
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index ec7e368a58..3cb06ca5c6 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -621,8 +621,15 @@ void main(void)
     rc = disk_mount_all();
     if (rc<=0)
     {
+        struct partinfo pinfo;
         reset_screen();
         printf("No partition found");
+        for (int i = 0 ; i < NUM_VOLUMES ; i++) {
+            disk_partinfo(i, &pinfo);
+            if (pinfo.type)
+                printf("P%d T%02x S%08lx",
+                       i, pinfo.type, pinfo.size);
+        }
         while(button_get(true) != SYS_USB_CONNECTED) {};
     }