diff --git a/HBC/META.XML b/HBC/META.XML index fbc3c112..a3e8a8d9 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 1.0 r1000 - 201011141520 + 1.0 r1004 + 201011281641 Loads games from USB-devices USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller. diff --git a/source/fatmounter.c b/source/fatmounter.c index e6f6fb68..b215216e 100644 --- a/source/fatmounter.c +++ b/source/fatmounter.c @@ -57,7 +57,7 @@ int USBDevice_Init() // wait 0.5 sec for the USB to spin up...stupid slow ass HDD do { - started = (!__io_usbstorage2.startup() || !__io_usbstorage2.isInserted()); + started = (__io_usbstorage2.startup() && __io_usbstorage2.isInserted()); usleep(50000); --retries; } @@ -79,29 +79,34 @@ int USBDevice_Init_Loop() { time_t starttime = time(0); time_t timenow = starttime; - int ret = -1; - bool printStart = true; + bool StatusPrinted = false; + bool started = false; - while(timenow-starttime < 30 && ret < 0) + do { - ret = USBDevice_Init(); - if(ret < 0) + started = (__io_usbstorage2.startup() && __io_usbstorage2.isInserted()); + + if(!started) { - if(printStart) + if(timenow != time(0)) { - printf("failed\n"); - printf("\tWaiting for slow HDD..."); - printStart = false; + timenow = time(0); + if(!StatusPrinted) + { + printf("\tWaiting for slow HDD..."); + StatusPrinted = true; + } + printf("%i ", (int) (timenow-starttime)); } - printf("%i ", (int) (timenow-starttime+1)); + usleep(100000); } - - timenow = time(0); } + while(!started && timenow-starttime < 30); - printf("\n"); + if(StatusPrinted) + printf("\n"); - return ret; + return USBDevice_Init(); } void USBDevice_deInit() diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp index 421d2fc2..f3d4ab55 100644 --- a/source/settings/CSettings.cpp +++ b/source/settings/CSettings.cpp @@ -82,7 +82,7 @@ void CSettings::SetDefault() gamesound = 1; parentalcontrol = 0; lockedgames = 0; - cios = 222; + cios = 249; xflip = XFLIP_NO; quickboot = OFF; wiilight = 1; diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp index 28b85488..7c435424 100644 --- a/source/system/IosLoader.cpp +++ b/source/system/IosLoader.cpp @@ -54,10 +54,8 @@ s32 IosLoader::LoadAppCios() // Unmount fat before reloading IOS. SDCard_deInit(); USBDevice_deInit(); - __io_usbstorage.shutdown(); - USB_Deinitialize(); - u32 ciosLoadPriority[] = { 250, 222, 249, Settings.cios }; // Descending. + u32 ciosLoadPriority[] = { 250, 249, 222, Settings.cios }; // Descending. for (u8 i = (sizeof(ciosLoadPriority)/sizeof(ciosLoadPriority[0]))-1; i >= 0; i--) @@ -97,9 +95,6 @@ s32 IosLoader::LoadGameCios(s32 ios) SDCard_deInit(); USBDevice_deInit(); WDVD_Close(); - __io_usbstorage.shutdown(); // libogc usb - __io_usbstorage2.shutdown(); // cios usb - USB_Deinitialize(); // main usb handle ret = ReloadIosSafe(ios);