The-Homebrew-Cloud
/
AutobootModule
mirror of https://github.com/wiiu-env/AutobootModule.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 8d6a86377b into 67dfdd1fc8

This commit is contained in:
jan-hofmeier 2024-05-02 12:28:06 +00:00 committed by GitHub
parent 67dfdd1fc8 8d6a86377b
commit ffe4712ec3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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.
return;
}
int connectedStorage = 0;
if ((connectedStorage = numberUSBStorageDevicesConnected()) <= 0) {
nn::spm::Initialize();
InitEmptyExternalStorage();
nn::spm::Finalize();
return;
}
int connectedStorage = numberUSBStorageDevicesConnected();
DEBUG_FUNCTION_LINE("Connected StorageDevices = %d", connectedStorage);
nn::spm::Initialize();
nn::spm::StorageListItem items[0x20];
int tries = 0;
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);
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.");
break;
}
OSSleepTicks(OSMillisecondsToTicks(16));
tries++;
}
if (!found) {
DEBUG_FUNCTION_LINE("USB Storage is connected but either it doesn't have a WFS partition or we ran into a timeout.");