The-Homebrew-Cloud/AutobootModule
2
0
Fork 0
mirror of https://github.com/wiiu-env/AutobootModule.git synced 2024-06-01 13:48:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

still try to mount usb at least once to fix virtual usb

Browse Source
This commit is contained in:
Jan Hofmeier 2024-05-02 14:23:51 +02:00
parent 67dfdd1fc8
commit 8d6a86377b
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/StorageUtils.cpp
View File

@ -90,23 +90,17 @@ void initExternalStorage() {
// the lib before actually using it. // the lib before actually using it.
return; return;
} }
int connectedStorage = 0; int connectedStorage = numberUSBStorageDevicesConnected();
if ((connectedStorage = numberUSBStorageDevicesConnected()) <= 0) {
nn::spm::Initialize();
InitEmptyExternalStorage();
nn::spm::Finalize();
return;
}
DEBUG_FUNCTION_LINE("Connected StorageDevices = %d", connectedStorage); DEBUG_FUNCTION_LINE("Connected StorageDevices = %d", connectedStorage);
nn::spm::Initialize(); nn::spm::Initialize();
nn::spm::StorageListItem items[0x20]; nn::spm::StorageListItem items[0x20];
int tries = 0;
bool found = false; bool found = false;
while (tries < 1200) { // Wait up to 20 seconds, like the Wii U Menu for(int tries = 1200; tries; tries--) { // Wait up to 20 seconds, like the Wii U Menu
int32_t numItems = nn::spm::GetStorageList(items, 0x20); int32_t numItems = nn::spm::GetStorageList(items, 0x20);
DEBUG_FUNCTION_LINE("Number of items: %d", numItems); DEBUG_FUNCTION_LINE("Number of items: %d", numItems);
@ -127,12 +121,11 @@ void initExternalStorage() {
} }
} }
} }
if (found || (connectedStorage == numItems)) { if (found || (connectedStorage <= numItems)) {
DEBUG_FUNCTION_LINE("Found all expected items, breaking."); DEBUG_FUNCTION_LINE("Found all expected items, breaking.");
break; break;
} }
OSSleepTicks(OSMillisecondsToTicks(16)); OSSleepTicks(OSMillisecondsToTicks(16));
tries++;
} }
if (!found) { if (!found) {
DEBUG_FUNCTION_LINE("USB Storage is connected but either it doesn't have a WFS partition or we ran into a timeout."); DEBUG_FUNCTION_LINE("USB Storage is connected but either it doesn't have a WFS partition or we ran into a timeout.");