mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-01 00:55:06 +01:00
-removed sys_dolphin mode. meaning no longer able to load wiiflow in the dolphin emu. i doubt if anyone did.
This commit is contained in:
parent
db2abf7669
commit
c5168d89aa
BIN
out/boot.dol
BIN
out/boot.dol
Binary file not shown.
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 3.3 MiB |
@ -120,11 +120,9 @@ bool IOS_D2X(u8 ios, u8 *base)
|
||||
|
||||
u8 IOS_GetType(u8 slot)
|
||||
{
|
||||
/* No more checks needed */
|
||||
if(neek2o() || Sys_DolphinMode())
|
||||
if(neek2o())
|
||||
return IOS_TYPE_NEEK2O;
|
||||
|
||||
/* Lets do this */
|
||||
|
||||
u32 TMD_Length;
|
||||
signed_blob *TMD_Buffer = GetTMD(slot, &TMD_Length);
|
||||
if(TMD_Buffer == NULL)
|
||||
|
@ -46,8 +46,6 @@ void check_neek2o(void)
|
||||
if(checked == true)
|
||||
return;
|
||||
checked = true;
|
||||
if(Sys_DolphinMode() == true)
|
||||
return;
|
||||
|
||||
s32 ESHandle = IOS_Open("/dev/es", 0);
|
||||
neek = (IOS_Ioctlv(ESHandle, 0xA2, 0, 0, NULL) == 0x666c6f77);
|
||||
|
@ -171,50 +171,6 @@ void Sys_SetNeekPath(const char *Path)
|
||||
NeekPath = Path;
|
||||
}
|
||||
|
||||
bool ModeChecked = false;
|
||||
bool DolphinMode = false;
|
||||
bool Sys_DolphinMode(void)
|
||||
{
|
||||
if(ModeChecked)
|
||||
return DolphinMode;
|
||||
|
||||
/* Thanks to skidau for that code! */
|
||||
u32 ifpr11 = 0x12345678;
|
||||
u32 ifpr12 = 0x9abcdef0;
|
||||
u32 ofpr1 = 0x00000000;
|
||||
u32 ofpr2 = 0x00000000;
|
||||
asm volatile (
|
||||
"lwz 3,%[ifpr11]\n\t"
|
||||
"stw 3,8(1)\n\t"
|
||||
"lwz 3,%[ifpr12]\n\t"
|
||||
"stw 3,12(1)\n\t"
|
||||
|
||||
"lfd 1,8(1)\n\t"
|
||||
"frsqrte 1, 1\n\t"
|
||||
"stfd 1,8(1)\n\t"
|
||||
|
||||
"lwz 3,8(1)\n\t"
|
||||
"stw 3, %[ofpr1]\n\t"
|
||||
"lwz 3,12(1)\n\t"
|
||||
"stw 3, %[ofpr2]\n\t"
|
||||
|
||||
:
|
||||
[ofpr1]"=m" (ofpr1)
|
||||
,[ofpr2]"=m" (ofpr2)
|
||||
:
|
||||
[ifpr11]"m" (ifpr11)
|
||||
,[ifpr12]"m" (ifpr12)
|
||||
|
||||
);
|
||||
if(ofpr1 != 0x56cc62b2)
|
||||
DolphinMode = true;
|
||||
else
|
||||
DolphinMode = false;
|
||||
|
||||
ModeChecked = true;
|
||||
return DolphinMode;
|
||||
}
|
||||
|
||||
bool hw_checked = false;
|
||||
bool on_hw = false;
|
||||
bool Sys_HW_Access(void)
|
||||
@ -222,7 +178,7 @@ bool Sys_HW_Access(void)
|
||||
if(hw_checked == true)
|
||||
return on_hw;
|
||||
|
||||
on_hw = AHBPROT_Patched() && (!Sys_DolphinMode() && !neek2o());
|
||||
on_hw = AHBPROT_Patched() && !neek2o();
|
||||
hw_checked = true;
|
||||
return on_hw;
|
||||
}
|
||||
|
@ -33,7 +33,6 @@ enum
|
||||
|
||||
/* Prototypes */
|
||||
void Sys_Init(void);
|
||||
bool Sys_DolphinMode(void);
|
||||
bool Sys_HW_Access(void);
|
||||
bool Sys_Exiting(void);
|
||||
void Sys_Exit(void);
|
||||
|
@ -120,9 +120,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
}
|
||||
if(Sys_DolphinMode())
|
||||
gprintf("Dolphin-Emu\n");
|
||||
else if(IsOnWiiU())
|
||||
if(IsOnWiiU())
|
||||
gprintf("vWii Mode\n");
|
||||
else
|
||||
gprintf("Real Wii\n");
|
||||
@ -138,7 +136,7 @@ int main(int argc, char **argv)
|
||||
/* Init NAND handlers */
|
||||
NandHandle.Init();
|
||||
check_neek2o();
|
||||
if(neek2o() || Sys_DolphinMode())
|
||||
if(neek2o())
|
||||
NandHandle.Init_ISFS();
|
||||
else
|
||||
NandHandle.LoadDefaultIOS(); /* safe reload to preferred IOS */
|
||||
@ -148,7 +146,7 @@ int main(int argc, char **argv)
|
||||
InternalSave.LoadSettings();
|
||||
|
||||
/* Handle (c)IOS Loading */
|
||||
if(neek2o() || Sys_DolphinMode()) /* wont reload anythin */
|
||||
if(neek2o()) /* wont reload anythin */
|
||||
iosOK = loadIOS(IOS_GetVersion(), false);
|
||||
else if(useMainIOS && CustomIOS(IOS_GetType(mainIOS))) /* Requested */
|
||||
iosOK = loadIOS(mainIOS, false) && CustomIOS(CurrentIOS.Type);
|
||||
@ -159,7 +157,7 @@ int main(int argc, char **argv)
|
||||
|
||||
/* mount Devices */
|
||||
DeviceHandle.MountSD();// mount SD before calling isUsingUSB() duh!
|
||||
DeviceHandle.SetMountUSB(isUsingUSB() && !Sys_DolphinMode());
|
||||
DeviceHandle.SetMountUSB(isUsingUSB());
|
||||
DeviceHandle.MountAllUSB();// only mounts any USB if isUsingUSB()
|
||||
|
||||
/* init wait images and show wait animation */
|
||||
@ -172,7 +170,7 @@ int main(int argc, char **argv)
|
||||
/* init configs, folders, coverflow, gui and more */
|
||||
if(mainMenu.init())
|
||||
{
|
||||
if(CurrentIOS.Version != mainIOS && !neek2o() && !Sys_DolphinMode())
|
||||
if(CurrentIOS.Version != mainIOS && !neek2o())
|
||||
{
|
||||
if(useMainIOS || !DeviceHandle.UsablePartitionMounted())
|
||||
{
|
||||
|
@ -231,7 +231,7 @@ bool CMenu::init()
|
||||
|
||||
/* Load cIOS Map */
|
||||
_installed_cios.clear();
|
||||
if(!neek2o() && !Sys_DolphinMode())
|
||||
if(!neek2o())
|
||||
_load_installed_cioses();
|
||||
else
|
||||
_installed_cios[CurrentIOS.Version] = CurrentIOS.Version;
|
||||
@ -2603,7 +2603,7 @@ void CMenu::RemoveCover(const char *id)
|
||||
void CMenu::TempLoadIOS(int IOS)
|
||||
{
|
||||
/* Only temp reload in IOS58 mode */
|
||||
if(useMainIOS || neek2o() || Sys_DolphinMode())
|
||||
if(useMainIOS || neek2o())
|
||||
return;
|
||||
|
||||
if(IOS == IOS_TYPE_NORMAL_IOS)
|
||||
|
@ -1907,7 +1907,7 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd, bool disc_cfg)
|
||||
error(_t("errgame15", L"Missing ext_loader.bin or ext_booter.bin!"));
|
||||
_exitWiiflow();
|
||||
}
|
||||
if((!dvd || neek2o()) && !Sys_DolphinMode())
|
||||
if(!dvd || neek2o())
|
||||
{
|
||||
if(_loadIOS(gameIOS, userIOS, id) == LOAD_IOS_FAILED)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user