mirror of
https://gitlab.com/Nanolx/homebrewfilter.git
synced 2024-11-28 12:04:23 +01:00
don't init Gecko on vWii / don't display bootmii-boot2 setting
This commit is contained in:
Christopher Roy Bratusek
parent
b81834e353
commit
ccfaf28bba
@ -28,7 +28,9 @@ int temp_device_icon;
|
||||
int temp_wiiload_ios;
|
||||
int temp_wiiload_ahb;
|
||||
bool temp_sdgecko;
|
||||
#ifndef VWII
|
||||
bool temp_bootmii_boot2;
|
||||
#endif
|
||||
bool temp_navigation;
|
||||
string temp_device_dat;
|
||||
|
||||
@ -56,8 +58,9 @@ int MenuSettingsFile()
|
||||
childlock = 1;
|
||||
bool navigation = Options.navigation;
|
||||
bool sdgecko = Options.sdgecko;
|
||||
bool bootmii_boot2 = Options.bootmii_boot2;
|
||||
|
||||
#ifndef VWII
|
||||
bool bootmii_boot2 = Options.bootmii_boot2;
|
||||
#endif
|
||||
string device_dat;
|
||||
if(Settings.device_dat == "sd1")
|
||||
device_dat = "SD";
|
||||
@ -78,7 +81,9 @@ int MenuSettingsFile()
|
||||
sprintf(options.name[i++], tr("Wiiload IOS"));
|
||||
sprintf(options.name[i++], tr("Wiiload IOS Reload"));
|
||||
sprintf(options.name[i++], tr("SD Gecko"));
|
||||
#ifndef VWII
|
||||
sprintf(options.name[i++], tr("BootMii in Boot2"));
|
||||
#endif
|
||||
sprintf(options.name[i++], tr("Childlock"));
|
||||
sprintf(options.name[i++], tr("Navigation key exchange"));
|
||||
sprintf(options.name[i++], tr("Display"));
|
||||
@ -213,11 +218,11 @@ int MenuSettingsFile()
|
||||
case SDGECKO:
|
||||
sdgecko = 1;
|
||||
break;
|
||||
|
||||
case BOOTMII_BOOT2:
|
||||
bootmii_boot2 = 1;
|
||||
break;
|
||||
|
||||
#ifndef VWII
|
||||
case BOOTMII_BOOT2:
|
||||
bootmii_boot2 = 1;
|
||||
break;
|
||||
#endif
|
||||
case STORAGE_DEVICE:
|
||||
device_dat = "USB";
|
||||
sprintf (options.value[STORAGE_DEVICE], device_dat.c_str());
|
||||
@ -299,11 +304,11 @@ int MenuSettingsFile()
|
||||
case SDGECKO:
|
||||
sdgecko = 0;
|
||||
break;
|
||||
|
||||
case BOOTMII_BOOT2:
|
||||
bootmii_boot2 = 0;
|
||||
break;
|
||||
|
||||
#ifndef VWII
|
||||
case BOOTMII_BOOT2:
|
||||
bootmii_boot2 = 0;
|
||||
break;
|
||||
#endif
|
||||
case STORAGE_DEVICE:
|
||||
device_dat = "SD";
|
||||
sprintf (options.value[STORAGE_DEVICE], device_dat.c_str());
|
||||
@ -334,7 +339,9 @@ int MenuSettingsFile()
|
||||
temp_wiiload_ahb = wiiload_ahb;
|
||||
temp_device_dat = device_dat;
|
||||
temp_sdgecko = sdgecko;
|
||||
temp_bootmii_boot2 = bootmii_boot2;
|
||||
#ifndef VWII
|
||||
temp_bootmii_boot2 = bootmii_boot2;
|
||||
#endif
|
||||
temp_navigation = navigation;
|
||||
/******************************************************************************/
|
||||
|
||||
@ -394,7 +401,9 @@ int MenuSettingsFile()
|
||||
else
|
||||
childlock = 1;
|
||||
sdgecko = temp_sdgecko;
|
||||
bootmii_boot2 = temp_bootmii_boot2;
|
||||
#ifndef VWII
|
||||
bootmii_boot2 = temp_bootmii_boot2;
|
||||
#endif
|
||||
navigation = temp_navigation;
|
||||
}
|
||||
else
|
||||
@ -455,12 +464,12 @@ int MenuSettingsFile()
|
||||
sprintf (options.value[SDGECKO], tr("No"));
|
||||
else
|
||||
sprintf (options.value[SDGECKO], tr("Yes"));
|
||||
|
||||
if(!bootmii_boot2)
|
||||
sprintf (options.value[BOOTMII_BOOT2], tr("No"));
|
||||
else
|
||||
sprintf (options.value[BOOTMII_BOOT2], tr("Yes"));
|
||||
|
||||
#ifndef VWII
|
||||
if(!bootmii_boot2)
|
||||
sprintf (options.value[BOOTMII_BOOT2], tr("No"));
|
||||
else
|
||||
sprintf (options.value[BOOTMII_BOOT2], tr("Yes"));
|
||||
#endif
|
||||
if(!navigation)
|
||||
sprintf (options.value[NAVIGATION], tr("No"));
|
||||
else
|
||||
@ -533,7 +542,9 @@ int MenuSettingsFile()
|
||||
Options.wiiload_ahb = wiiload_ahb;
|
||||
device_dat = options.value[STORAGE_DEVICE];
|
||||
Options.sdgecko = sdgecko;
|
||||
Options.bootmii_boot2 = bootmii_boot2;
|
||||
#ifndef VWII
|
||||
Options.bootmii_boot2 = bootmii_boot2;
|
||||
#endif
|
||||
Options.navigation = navigation;
|
||||
Options.network = Options.temp_network;
|
||||
Options.wifigecko = Options.temp_wifigecko;
|
||||
|
||||
@ -31,7 +31,9 @@ enum
|
||||
WIILOAD_IOS,
|
||||
WIILOAD_AHB,
|
||||
SDGECKO,
|
||||
#ifndef VWII
|
||||
BOOTMII_BOOT2,
|
||||
#endif
|
||||
CHILDLOCK,
|
||||
NAVIGATION,
|
||||
DISPLAY,
|
||||
|
||||
@ -171,7 +171,9 @@ DefaultOptions()
|
||||
Options.quick_start = 0;
|
||||
Options.show_all = 1;
|
||||
Options.sdgecko = 1;
|
||||
Options.bootmii_boot2 = 0;
|
||||
#ifndef VWII
|
||||
Options.bootmii_boot2 = 0;
|
||||
#endif
|
||||
Options.navigation = 0;
|
||||
Options.temp_network = 0;
|
||||
Options.temp_wifigecko = 0;
|
||||
@ -193,10 +195,10 @@ main(int argc, char *argv[])
|
||||
MountAllDevices();
|
||||
InitNetworkThread(); // Initialize Network
|
||||
InitTcpThread();
|
||||
|
||||
#ifndef VWII
|
||||
if (gecko_connected)
|
||||
InitGeckoThread();
|
||||
|
||||
#endif
|
||||
InitThrobberThread(); // Initialize Throbber
|
||||
ISFS_Initialize(); // Initialize Nand
|
||||
|
||||
@ -207,10 +209,10 @@ main(int argc, char *argv[])
|
||||
DefaultTheme();
|
||||
|
||||
load();
|
||||
|
||||
#ifndef VWII
|
||||
if (gecko_connected)
|
||||
ResumeGeckoThread();
|
||||
|
||||
#endif
|
||||
SetFont();
|
||||
|
||||
SYS_SetResetCallback(WiiResetPressed);
|
||||
|
||||
@ -132,7 +132,9 @@ struct SOptions
|
||||
bool network;
|
||||
bool wifigecko;
|
||||
bool newrevtext;
|
||||
#ifndef VWII
|
||||
bool bootmii_boot2;
|
||||
#endif
|
||||
int wiiload_ahb;
|
||||
int wiiload_ios;
|
||||
};
|
||||
|
||||
1
updates
1
updates
@ -16,6 +16,7 @@
|
||||
- build using libruntimeiospatch 1.3
|
||||
- vWii version does NOT YET disable functions not applicable von vWii
|
||||
- installer now falls back to IOS236 if there's no HW_AHBPROT access
|
||||
- SDCardGecko (Debugfile) is now stored on general settings device
|
||||
|
||||
//rev41:
|
||||
- fixed auto-connecting Internet via WiFi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user