From 37cee63ed9dfb821ec190dfc4813f6c2abad9f0b Mon Sep 17 00:00:00 2001 From: dhewg Date: Fri, 16 Jul 2010 14:04:57 +0200 Subject: [PATCH] Revert "detect shutdown from GameCube mode This reverts commit 8daf6db9ac4de72099f3a1eb9f16e3183eba12c2. The detection code doesn't work on some Wiis, is even problematic on others, so get rid of it. This commit doesn't revert "pass through to the system menu", but thanks for commiting two things as one :P --- main.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/main.c b/main.c index cc302a3..daa1937 100644 --- a/main.c +++ b/main.c @@ -73,24 +73,18 @@ u32 _main(void *base) gecko_printf("Initializing IPC...\n"); ipc_initialize(); - if (read32(0x0d800190) & 2) { - gecko_printf("GameCube compatibility mode detected...\n"); - vector = boot2_run(1, 0x101); - goto shutdown; - } - - if (read32(0x3130) == 0xFFFFFFFF) { - gecko_printf("GameCube shutdown detected, bypassing.\n"); - vector = boot2_run(1,2); - goto shutdown; - } - gecko_printf("Initializing SDHC...\n"); sdhc_init(); gecko_printf("Mounting SD...\n"); fres = f_mount(0, &fatfs); + if (read32(0x0d800190) & 2) { + gecko_printf("GameCube compatibility mode detected...\n"); + vector = boot2_run(1, 0x101); + goto shutdown; + } + if(fres != FR_OK) { gecko_printf("Error %d while trying to mount SD\n", fres); panic2(0, PANIC_MOUNT); @@ -101,8 +95,8 @@ u32 _main(void *base) res = powerpc_boot_file(PPC_BOOT_FILE); if(res < 0) { gecko_printf("Failed to boot PPC: %d\n", res); - gecko_printf("booting system menu\n"); - vector = boot2_run(1,2); + gecko_printf("Booting System Menu\n"); + vector = boot2_run(1, 2); goto shutdown; }