Skip to content

Try next LUN when disk signature invalid #1187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kewlduda wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Try next LUN when disk signature invalid #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e17850b
cyberstudio fix for FIX94#991
kewlduda Mar 16, 2024
903a6f3
Delete loader.dol
kewlduda Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed loader/loader.dol
View file
Open in desktop
Binary file not shown.
40 changes: 22 additions & 18 deletions loader/source/usbstorage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down