diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h index 65257c5f..b099515f 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_auto.h @@ -39,6 +39,7 @@ enum { AUTO_PROCESS_MENU_IMPORT_TAD, AUTO_PROCESS_MENU_IMPORT_NANDFIRM, AUTO_PROCESS_MENU_MCU, + AUTO_PROCESS_MENU_MACHINE_INITIALIZE, AUTO_PROCESS_MENU_NUM }; diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c index df042872..498600fb 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c @@ -107,6 +107,7 @@ void* AutoProcess1(void) { case AUTO_PROCESS_MENU_FORMAT: return FormatProcess0; + case AUTO_PROCESS_MENU_HARDWARE_INFO: return HWInfoProcess0; @@ -124,6 +125,9 @@ void* AutoProcess1(void) case AUTO_PROCESS_MENU_MCU: return mcuProcess0; + case AUTO_PROCESS_MENU_MACHINE_INITIALIZE: + return FormatProcess0; + case AUTO_PROCESS_MENU_NUM: return AutoProcess2; } @@ -171,16 +175,7 @@ void* AutoProcess2(void) kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT TAD FROM SD "); kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD"); kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " WRITE MCU FIRM "); -#ifndef AUTO_FORMAT_MODE - if (gAutoProcessResult[AUTO_PROCESS_MENU_MCU] == AUTO_PROCESS_RESULT_SKIP) - { - kamiFontPrintf(3, 22, FONT_COLOR_BLACK, " Button B : return to menu"); - } - else - { - kamiFontPrintf(3, 22, FONT_COLOR_BLACK, " Please Shut Down"); - } -#endif //AUTO_FORMAT_MODE + kamiFontPrintf(3, line += 2, FONT_COLOR_BLACK, " MACHINE INITIALIZE "); /* for (i=0;i #include "debugger_hw_reset_control.h" +extern u32 CARDi_ReadRomIDCore(void); + /*---------------------------------------------------------------------------* 型定義 *---------------------------------------------------------------------------*/ @@ -58,7 +60,7 @@ static void CardAccessThread(void* arg) while (!sHwResetEnable) { CARD_LockRom((u16)sLockId); - (void)CARDi_ReadRomID(); + (void)CARDi_ReadRomIDCore(); CARD_UnlockRom((u16)sLockId); // 5秒間スリープ