diff --git a/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c index 26142490..884dd705 100644 --- a/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c +++ b/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c @@ -317,12 +317,8 @@ BOOL HWI_ModifyLanguage( u8 region ) *---------------------------------------------------------------------------*/ BOOL HWI_WriteHWNormalInfoFile( void ) { - const char* CAMERA_VOLATILE_INFO_PATH = "rom:/data/camera_volatile_info.bin"; LCFGTWLHWNormalInfo Info; - FSFile file; LCFGReadResult result; - BOOL open_is_ok; - BOOL read_is_ok; result = LCFGi_THW_ReadNormalInfo(); if( result != LCFG_TSF_READ_RESULT_SUCCEEDED ) { @@ -334,29 +330,6 @@ BOOL HWI_WriteHWNormalInfoFile( void ) Info.rtcAdjust = LCFG_THW_GetRTCAdjust(); - // ROMファイルオープン(カメラ情報) - FS_InitFile(&file); - open_is_ok = FS_OpenFile(&file, CAMERA_VOLATILE_INFO_PATH); - if (!open_is_ok) - { - OS_Printf("FS_OpenFile(\"%s\") ... ERROR!\n", CAMERA_VOLATILE_INFO_PATH); - return FALSE; - } - - // ROMファイルリード - read_is_ok = FS_ReadFile( &file, Info.camera, (s32)sizeof( Info.camera ) ); - if (!read_is_ok) - { - OS_Printf("FS_ReadFile(\"%s\") ... ERROR!\n", CAMERA_VOLATILE_INFO_PATH); - FS_CloseFile(&file); - return FALSE; - } - - FS_FlushFile(&file); - - // ROMファイルクローズ - FS_CloseFile(&file); - if (!LCFGi_THW_WriteNormalInfoDirect( &Info )) { OS_TPrintf( "HW Normal Info Write failed.\n" ); 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 97556f6f..88f84972 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_auto.c @@ -22,7 +22,7 @@ #include "process_hw_info.h" #include "process_import.h" #include "process_font.h" -#include "process_eticket.h" +//#include "process_eticket.h" #include "process_nandfirm.h" #include "process_norfirm.h" #include "process_auto.h" @@ -34,12 +34,23 @@ 型定義 *---------------------------------------------------------------------------*/ +enum { + MENU_FORMAT = 0, + MENU_HARDWARE_INFO, +#ifdef USE_WRITE_FONT_DATA + MENU_FONT_DATA, +#endif // USE_WRITE_FONT_DATA + MENU_IMPORT_TAD, +#ifndef MARIOCLUB_VERSION + MENU_IMPORT_NANDFIRM, +#endif // MARIOCLUB_VERSION + MENU_END +}; + /*---------------------------------------------------------------------------* 定数定義 *---------------------------------------------------------------------------*/ -#define NUM_OF_MENU 6 - /*---------------------------------------------------------------------------* グローバル変数定義 *---------------------------------------------------------------------------*/ @@ -98,23 +109,25 @@ void* AutoProcess1(void) { switch ( sMenuSelectNo++ ) { - case 0: + case MENU_FORMAT: return FormatProcess0; - case 1: + case MENU_HARDWARE_INFO: return HWInfoProcess0; - case 2: + +#ifdef USE_WRITE_FONT_DATA + case MENU_FONT_DATA: return fontProcess0; - case 3: - return eTicketProcess0; - case 4: +#endif // USE_WRITE_FONT_DATA + + case MENU_IMPORT_TAD: return ImportProcess0; - case 5: -#ifndef MARIOCLUB_VERSION + +#ifndef MARIOCLUB_VERSION + case MENU_IMPORT_NANDFIRM: return NandfirmProcess0; -#else - return AutoProcess2; -#endif //MARIOCLUB_VERSION - case 6: +#endif // MARIOCLUB_VERSION + + case MENU_END: return AutoProcess2; } @@ -154,10 +167,10 @@ void* AutoProcess2(void) kamiFontPrintf(3, 7, FONT_COLOR_BLACK, " FORMAT NAND "); kamiFontPrintf(3, 9, FONT_COLOR_BLACK, " WRITE HARDWARE INFO "); kamiFontPrintf(3, 11, FONT_COLOR_BLACK, " WRITE FONT DATA "); - kamiFontPrintf(3, 13, FONT_COLOR_BLACK, " WRITE ETICKET SIGN "); - kamiFontPrintf(3, 15, FONT_COLOR_BLACK, " INPORT TAD FROM SD "); +// kamiFontPrintf(3, 13, FONT_COLOR_BLACK, " WRITE ETICKET SIGN "); + kamiFontPrintf(3, 13, FONT_COLOR_BLACK, " INPORT TAD FROM SD "); #ifndef MARIOCLUB_VERSION - kamiFontPrintf(3, 17, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD"); + kamiFontPrintf(3, 15, FONT_COLOR_BLACK, " INPORT NANDFIRM FROM SD"); #endif //MARIOCLUB_VERSION #ifndef AUTO_FORMAT_MODE kamiFontPrintf(3, 22, FONT_COLOR_BLACK, " Button B : return to menu"); @@ -169,7 +182,7 @@ void* AutoProcess2(void) } // 失敗あり - if (i