*Fixed USB ReInit

*Moved SD Card Button a bit to the left.
This commit is contained in:
dimok321 2009-06-10 08:58:35 +00:00
parent 6f22ffa6f4
commit ad2eb5c182
5 changed files with 13 additions and 5 deletions

File diff suppressed because one or more lines are too long

View File

@ -306,7 +306,7 @@ void CFG_Default(int widescreen) // -1 = non forced Mode
THEME.clock_x = 0;
THEME.clock_y = 335;//330;
THEME.clockAlign = CFG_ALIGN_CENTRE;
THEME.sdcard_x = 160;
THEME.sdcard_x = 150;
THEME.sdcard_y = 390;
THEME.gameText_r = 0;
THEME.gameText_g = 0;

View File

@ -74,7 +74,7 @@ static bool _FAT_partition_isFAT(const DISC_INTERFACE* disc, sec_t startSector)
}
// Now verify that this is indeed a FAT partition
if (memcmp(sectorBuffer + BPB_FAT16_fileSysType, FAT_SIG, sizeof(FAT_SIG)) &&
if (memcmp(sectorBuffer + BPB_FAT16_fileSysType, FAT_SIG, sizeof(FAT_SIG)) &&
memcmp(sectorBuffer + BPB_FAT32_fileSysType, FAT_SIG, sizeof(FAT_SIG)))
{
return false;
@ -97,7 +97,7 @@ sec_t GetFATPartition(const DISC_INTERFACE* disc)
int i;
uint8_t sectorBuffer[BYTES_PER_READ] = {0};
sec_t startSector = 0;
if(!disc->startup())
return 0;
@ -159,6 +159,13 @@ int USBDevice_Init()
}
return -1;
}
void USBDevice_ReInit()
{
__io_usbstorage.shutdown();
__io_wiiums.shutdown();
if(__io_usbstorage.startup()) return;
else __io_wiiums.startup();
}
void USBDevice_deInit()
{

View File

@ -8,6 +8,7 @@ extern "C"
int USBDevice_Init();
void USBDevice_deInit();
void USBDevice_ReInit();
int isSdInserted();
int isInserted(const char *path);
int SDCard_Init();

View File

@ -677,7 +677,7 @@ static int MenuDiscList()
else if(sdcardBtn.GetState() == STATE_CLICKED)
{
USBDevice_Init()
USBDevice_ReInit();
SDCard_deInit();
SDCard_Init();
if (Settings.gameDisplay==list){