When disk signature invalid try the next LUN instead of giving up on the entire port

.github/actions/action.yml

@@ -0,0 +1,7 @@
+name: 'Make Nintendont'
+description: 'Compiles Nintendont'
+
+runs:
+  using: 'docker'
+  image: 'devkitpro/devkitppc:latest'
+  entrypoint: make

.github/workflows/main.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Compile Nintendont
+      uses: ./.github/actions
+    - name: Commit loader.dol
+      run: |
+        git config user.name '${GITHUB_ACTOR}'
+        git config user.email '${GITHUB_ACTOR}@users.noreply.github.com'
+        git add nintendont/loader.dol
+        git commit -m "loader.dol"
+        git push
+    - uses: actions/upload-artifact@v1
+      with: 
+        name: Nintendont
+        path: build/

.gitignore

@@ -2,11 +2,12 @@
 *.o
 *.bin
 *.elf
+build/
 codehandler/*.h
 kernel/asm/*.h
 kernel/kernel.map
 loader/build/
 loader/data/kernel.zip
-nintendont/boot.dol
+nintendont/*.dol
 fatfs/*.a
-codehandler/*.h
+codehandler/*.h

Makefile

@@ -85,6 +85,9 @@ loader: multidol resetstub fatfs/libfat-ppc.a kernel kernelboot loader/source/pp
 	@echo "Building Nintendont loader"
 	@echo " "
 	$(MAKE) -C loader
+	mkdir -p build/apps/Nintendont/
+	cp -p nintendont/icon.png nintendont/titles.txt build/apps/Nintendont/
+	unzip -d build/controllers -q -n controllerconfigs/controllers.zip
 
 clean:
 	@echo " "

common/include/NintendontVersion.h

@@ -2,7 +2,7 @@
 #define __NINTENDONT_VERSION_H__
 
 #define NIN_MAJOR_VERSION			6
-#define NIN_MINOR_VERSION			498
+#define NIN_MINOR_VERSION			499
 
 #define NIN_VERSION		((NIN_MAJOR_VERSION << 16) | NIN_MINOR_VERSION)
 

loader/Makefile

@@ -106,7 +106,9 @@ export OUTPUT	:=	$(CURDIR)/$(TARGET)
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-	@cp $(OUTPUT).dol ../nintendont/boot.dol
+	@mkdir -p ../build/apps/Nintendont/
+	@cp -p $(OUTPUT).dol ../build/apps/Nintendont/boot.dol
+	$(CC) -E -traditional -P -include ../common/include/NintendontVersion.h -DTIMESTAMP=`date +%Y%m%d%H%M%S` ../metaxml.sx | sed -n '/^<?xml/,$$p' > ../build/apps/Nintendont/meta.xml
 
 #---------------------------------------------------------------------------------
 clean:

loader/source/usbstorage.c

@@ -946,27 +946,31 @@ static bool __usbstorage_IsInserted(void)
 			// If not, it might be a Wii U drive.
 			retval = USBStorageOGC_Read(&__usbfd, __lun, 0, 1, sector_buf);
 			if (retval == 0) {
-				if (sector_buf[510] == 0x55 &&
-				    (sector_buf[511] == 0xAA || sector_buf[511] == 0xAB))
-				{
-					// Valid MBR and/or UStealth signature.
-					__mounted = true;
-					__vid = vid;
-					__pid = pid;
-					usb_last_used = gettime()-secs_to_ticks(100);
-					usleep(10000);
-				} else {
-					// Invalid signature.
+				// discard first read. I've seen a controller so buggy which returns the boot sector of LUN 1 when that of LUN 0 is asked for.
+				usb_last_used = gettime()-secs_to_ticks(100);
+				usleep(10000);
+				retval = USBStorageOGC_Read(&__usbfd, __lun, 0, 1, sector_buf);
+				if (retval == 0) {
+					if (sector_buf[510] == 0x55 &&
+					    (sector_buf[511] == 0xAA || sector_buf[511] == 0xAB))
+					{
+						// Valid MBR and/or UStealth signature.
+						__mounted = true;
+						__vid = vid;
+						__pid = pid;
+						usb_last_used = gettime()-secs_to_ticks(100);
+						usleep(10000);
+						break;	// found valid signature. Done!
+					}
+					// Else invalid signature.
 					// This may be a Wii U-formatted HDD.
-					__mounted = false;
-					__lun = 0;
 				}
-			} else {
-				// Read error.
-				__mounted = false;
-				__lun = 0;
+				// Else read error.
 			}
-			break;
+			// Else read error.
+			__mounted = false;
+			__lun = 0;
+			// continue scanning for next LUN instead of giving up
 		}
 
 		if (__mounted)

metaxml.sx

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
+<app version="1">
+	<name>Nintendont</name>
+	<coder>FIX94, crediar</coder>
+	<version>NIN_MAJOR_VERSION.NIN_MINOR_VERSION</version>
+	<release_date>TIMESTAMP</release_date>
+	<short_description>Gamecube Loader</short_description>
+	<long_description>Nintendont allows you to run GameCube games on a Wii or Wii U from an SD or HDD device.
+
+ Project website: https://github.com/FIX94/Nintendont 
+
+Committers: GerbilSoft, JoostinOnline, GreyRogue, Howard, Cyan, nastys, carnage702, AnthonyRyuki, DankRank, Chickoodel, akemin-dayo, SuperrSonic, KoldMonster12, cheatfreak47, capnfunky77, cesarmades, crazycaveman, Wolfy76700, AndyCasaceli, ShadowOne333, Aurelio92, darkalemanbr, jmapjp, sailormoon, Dr-Crow, cyberstudio10, corey-underdown</long_description>
+	<no_ios_reload/>
+	<ahb_access/>
+</app>