mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-27 05:34:15 +01:00
-fixed nand emulation partition set for d2x v8 properly now
-wasted 3 hours finding this stupid bug
This commit is contained in:
parent
8c18d1fa3c
commit
cc76da97e1
@ -42,16 +42,12 @@ static u32 allowedBases[] = { 37, 38, 53, 55, 56, 57, 58 };
|
||||
/* Check if the cIOS is a D2X. */
|
||||
bool cIOSInfo::D2X(u8 ios, u8 *base)
|
||||
{
|
||||
bool ret = false;
|
||||
|
||||
iosinfo_t *info = GetInfo(ios);
|
||||
if(info != NULL)
|
||||
{
|
||||
*base = (u8)info->baseios;
|
||||
SAFE_FREE(info);
|
||||
ret = true;
|
||||
}
|
||||
return ret;
|
||||
if(!info)
|
||||
return false;
|
||||
*base = (u8)info->baseios;
|
||||
SAFE_FREE(info);
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1,6 +1,10 @@
|
||||
|
||||
#include "menu.hpp"
|
||||
#include "nand.hpp"
|
||||
#include "sys.h"
|
||||
#include "loader/cios.hpp"
|
||||
#include "loader/alt_ios.h"
|
||||
#include "gecko/gecko.h"
|
||||
|
||||
|
||||
using namespace std;
|
||||
@ -186,7 +190,12 @@ int CMenu::_config1(void)
|
||||
bool disable = m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true);
|
||||
if(!disable)
|
||||
{
|
||||
bool isD2XnewerThanV6 = IOS_GetRevision() % 100 > 6;
|
||||
Nand::Instance()->Disable_Emu();
|
||||
bool isD2XnewerThanV6 = false;
|
||||
iosinfo_t * iosInfo = cIOSInfo::GetInfo(mainIOS);
|
||||
if (iosInfo->version > 6)
|
||||
isD2XnewerThanV6 = true;
|
||||
Nand::Instance()->Enable_Emu();
|
||||
u8 limiter = 0;
|
||||
s8 direction = m_btnMgr.selected(m_configBtnPartitionP) ? 1 : -1;
|
||||
currentPartition = loopNum(currentPartition + direction, (int)USB8);
|
||||
|
@ -1,5 +1,6 @@
|
||||
|
||||
#include "menu.hpp"
|
||||
#include "nand.hpp"
|
||||
#include "loader/wdvd.h"
|
||||
#include "network/gcard.h"
|
||||
#include "DeviceHandler.hpp"
|
||||
@ -11,6 +12,8 @@
|
||||
#include "gecko.h"
|
||||
#include "sys.h"
|
||||
#include "disc.h"
|
||||
#include "loader/cios.hpp"
|
||||
#include "loader/alt_ios.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -328,8 +331,13 @@ int CMenu::main(void)
|
||||
{
|
||||
_showWaitMessage();
|
||||
_hideMain();
|
||||
|
||||
bool isD2XnewerThanV6 = IOS_GetRevision() % 100 > 6;
|
||||
|
||||
Nand::Instance()->Disable_Emu();
|
||||
bool isD2XnewerThanV6 = false;
|
||||
iosinfo_t * iosInfo = cIOSInfo::GetInfo(mainIOS);
|
||||
if (iosInfo->version > 6)
|
||||
isD2XnewerThanV6 = true;
|
||||
Nand::Instance()->Enable_Emu();
|
||||
u8 limiter = 0;
|
||||
currentPartition = loopNum(currentPartition + 1, (int)USB8);
|
||||
while(!DeviceHandler::Instance()->IsInserted(currentPartition) ||
|
||||
|
Loading…
Reference in New Issue
Block a user