mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-01 00:55:06 +01:00
- removed some bootup error messages that never could display anyway.
- removed old wiiflow lite stub bin we no longer use. - fixed arg boot of wii game ID on bootup.
This commit is contained in:
parent
2e3504d657
commit
85c0f05b6d
BIN
data/stub.bin
BIN
data/stub.bin
Binary file not shown.
BIN
out/boot.dol
BIN
out/boot.dol
Binary file not shown.
Before Width: | Height: | Size: 4.4 MiB After Width: | Height: | Size: 4.4 MiB |
@ -32,8 +32,6 @@ using std::vector;
|
|||||||
|
|
||||||
extern const u8 wfstub_bin[];
|
extern const u8 wfstub_bin[];
|
||||||
extern const u32 wfstub_bin_size;
|
extern const u32 wfstub_bin_size;
|
||||||
extern const u8 stub_bin[];
|
|
||||||
extern const u32 stub_bin_size;
|
|
||||||
|
|
||||||
u8 valid = 0;
|
u8 valid = 0;
|
||||||
|
|
||||||
|
@ -92,7 +92,6 @@ int main(int argc, char **argv)
|
|||||||
gprintf(" \nWelcome to %s %s!\nThis is the debug output.\n", APP_NAME, APP_VERSION);
|
gprintf(" \nWelcome to %s %s!\nThis is the debug output.\n", APP_NAME, APP_VERSION);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool iosOK = true;
|
|
||||||
char *gameid = NULL;
|
char *gameid = NULL;
|
||||||
bool showFlashImg = true;
|
bool showFlashImg = true;
|
||||||
bool wait_loop = false;
|
bool wait_loop = false;
|
||||||
@ -176,10 +175,10 @@ int main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
NandHandle.DeInit_ISFS();
|
NandHandle.DeInit_ISFS();
|
||||||
NandHandle.Patch_AHB();
|
NandHandle.Patch_AHB();
|
||||||
iosOK = IOS_ReloadIOS(mainIOS) == 0;
|
IOS_ReloadIOS(mainIOS);
|
||||||
NandHandle.Init_ISFS();
|
NandHandle.Init_ISFS();
|
||||||
gprintf("AHBPROT disabled after IOS Reload: %s\n", AHBPROT_Patched() ? "yes" : "no");
|
gprintf("AHBPROT disabled after IOS Reload: %s\n", AHBPROT_Patched() ? "yes" : "no");
|
||||||
gprintf("Now using ");
|
gprintf("Now using ");// gprintf finished in IOS_GetCurrentIOSInfo()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
gprintf("Using IOS58\n");// stay on IOS58. no reload to cIOS
|
gprintf("Using IOS58\n");// stay on IOS58. no reload to cIOS
|
||||||
@ -214,27 +213,17 @@ int main(int argc, char **argv)
|
|||||||
/* init configs, folders, coverflow, gui and more */
|
/* init configs, folders, coverflow, gui and more */
|
||||||
if(mainMenu.init(usb_mounted))
|
if(mainMenu.init(usb_mounted))
|
||||||
{
|
{
|
||||||
if(!iosOK)
|
startup_successful = true;
|
||||||
mainMenu.terror("errboot1", L"No cIOS found!\ncIOS d2x 249 base 56 and 250 base 57 are enough for all your games.");
|
if(!isWiiVC)
|
||||||
else if(!DeviceHandle.UsablePartitionMounted())
|
writeStub();// copy return stub to memory
|
||||||
mainMenu.terror("errboot2", L"Could not find a device to save configuration files on!");
|
if(!isWiiVC && gameid != NULL && strlen(gameid) == 6)// if argv game ID then launch it
|
||||||
else if(WDVD_Init() < 0)
|
mainMenu.directlaunch(gameid);
|
||||||
mainMenu.terror("errboot3", L"Could not initialize the DIP module!");
|
else
|
||||||
else // alls good lets start wiiflow
|
mainMenu.main();// start wiiflow with main menu displayed
|
||||||
{
|
|
||||||
startup_successful = true;
|
|
||||||
if(!isWiiVC)
|
|
||||||
writeStub();// copy return stub to memory
|
|
||||||
if(gameid != NULL && strlen(gameid) == 6)// if argv game ID then launch it
|
|
||||||
mainMenu.directlaunch(gameid);
|
|
||||||
else
|
|
||||||
mainMenu.main();// start wiiflow with main menu displayed
|
|
||||||
}
|
|
||||||
//Exit WiiFlow, no game booted...
|
|
||||||
mainMenu.cleanup();// removes all sounds, fonts, images, coverflow, plugin stuff, source menu and clear memory
|
|
||||||
}
|
}
|
||||||
|
// at this point either wiiflow bootup failed or the user is exiting wiiflow
|
||||||
ShutdownBeforeExit();// unmount devices and close inputs
|
ShutdownBeforeExit();// unmount devices and close inputs
|
||||||
if(startup_successful)// use wiiflow's exit choice otherwise just exit to loader (system menu or hbc)
|
if(startup_successful)// use wiiflow's exit choice
|
||||||
Sys_Exit();
|
Sys_Exit();
|
||||||
return 0;
|
return 0;// otherwise just exit to loader (system menu or hbc).
|
||||||
}
|
}
|
||||||
|
@ -75,10 +75,9 @@ static u8 GetRequestedGameIOS(dir_discHdr *hdr)
|
|||||||
void CMenu::directlaunch(const char *GameID)// from boot arg for wii game only
|
void CMenu::directlaunch(const char *GameID)// from boot arg for wii game only
|
||||||
{
|
{
|
||||||
m_directLaunch = true;
|
m_directLaunch = true;
|
||||||
for(currentPartition = SD; currentPartition < USB8; currentPartition++)
|
currentPartition = m_cfg.getInt(WII_DOMAIN, "partition");
|
||||||
|
if(DeviceHandle.IsInserted(currentPartition))
|
||||||
{
|
{
|
||||||
if(!DeviceHandle.IsInserted(currentPartition))
|
|
||||||
continue;
|
|
||||||
DeviceHandle.OpenWBFS(currentPartition);
|
DeviceHandle.OpenWBFS(currentPartition);
|
||||||
string gameDir(fmt(wii_games_dir, DeviceName[currentPartition]));
|
string gameDir(fmt(wii_games_dir, DeviceName[currentPartition]));
|
||||||
string cacheDir(fmt("%s/%s_wii.db", m_listCacheDir.c_str(), DeviceName[currentPartition]));
|
string cacheDir(fmt("%s/%s_wii.db", m_listCacheDir.c_str(), DeviceName[currentPartition]));
|
||||||
|
Loading…
Reference in New Issue
Block a user