From f15fe4f9473a083c0fa62f7a4116998c1dfc2cd1 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Wed, 21 May 2008 11:46:04 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=9E=E3=83=AB=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E3=81=AB=E3=82=AB=E3=83=A1=E3=83=A9=E3=83=91=E3=83=A9?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=81=8C=E5=85=A5=E3=82=89=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=93=E3=81=A8=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=9F=E3=82=81=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82=20e=5Fticket(cert?= =?UTF-8?q?.sys)=20=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E3=83=A1=E3=83=8B?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1445 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../HWInfoWriter/ARM9/src/hwi.c | 27 ---------- .../ARM9.TWL/src/process_auto.c | 51 +++++++++++------- .../ARM9.TWL/src/process_eticket.c | 5 +- .../ARM9.TWL/src/process_topmenu.c | 6 --- .../data/camera_volatile_info.bin | Bin 2136 -> 0 bytes .../SystemUpdater/ARM9.TWL/main.rsf | 2 +- 6 files changed, 34 insertions(+), 57 deletions(-) delete mode 100644 build/systemMenu_tools/NandInitializerRed/data/camera_volatile_info.bin 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 (i4Nz276#m|Q%j1dL^2DXU-#HD;NYmqn3EfpqJ=|Axx-)~ zX(Hn&n%a&sR%S|!I!f4>DQQxoLy4x7I@Ty-&Z_8u>E6zLZ$%v^?|Juq@80vBd(XS) zo|7?VYI=@RQc_gp%{9SeLcR%wCU{LKHKE)Dp9%X+Xf#1n?V74-s#R0fC{@)}HAYqA zRW*^G{4{UM*nDql#_aj-oU9qM^Co7^d275o6@WuXs?S#%Bjn-C169t04?;kC&}2Cz zL>4WST2RH9p%to*j}9x?0Opl0z=uM~1wY8jKsQpv9Au&jj6pAmxoFboN;-0ohH8|< zN_v5V$zd@ULVDmJT!@Dkx#&#mL-LAmF@K3M=3oxRX-TuBS(}AKS2IU~tC35iXU>mP2^S!|@_ z35vDJ+SI>D$iy}!uY-b3M3I<>dC1*HOQS7cNRJE5lhEm3b@ChQmh@l+k5cTNQo5&f zcXjhRAE%t66KIp#)a|lg_IGX+@|;gOW{%7tOY=d4v+RF8xUQka9U2gH;xyLyl6o&~OmnQ+@_+5ZzhQK01q*~N4O>t_ha*{;^3)W_Om?Iz3eATKn zH_IYRG`&#u7D{qhzuam?Y%cvpmnon55hvYx;xa(7+j|=>(p%FsdRr`($7Tu(83X6y z34$M5hOgw~krfq{*?m;RJm^lRt~)2_`XrC8d%-ag6Qx$@h-I8_^HSLjNl%nr zvI}s@oT+-0qU$a%GaSG%n`|bR&v(=znF$AEQ2xgt4#O}C<1iUh@j4dbQ*5F?qx;)Q zbXuSb^+@Vb4DM*rDNS@4U8I9-f~*)gUXBW40^vE!c-clcS~cf2;)T#yV`3aFDTHzm zqbOq-x?vuPSPxJ-MhszOm4ir-6?#z0`#I$mOYM=NXepE_w_q-+e<8V9rl%kUvtx}eg!f<5@qOR~MFOg?`<38VRGHkZ%j zmG_5RBB?CI^9r2gqtL|n@nu*qUAnK~D)-R-Iu#Wk6@t~YRxy5~k-%cCV)cPD{2T6I z9)5s-9XQT(BpEwD`KqGwu?Vw*mZ9=Tfp8S?QZ|?$;aR*hi$&~{M#fA9S{H z@+-WQ4+u<=bvo0 zprWcH8Pn-ZmQl2-@Ga_4k4BuqCA8oM+9+Cr)fbcK_LgD;zQP_V%ExdDXK@i%a2>6< zYp}x56T|5aEyPEt#1{tdIGS)CmvIfZ&>m#zNXG({Q6}ubejLUx6idNrp@`lNu4Sbg zH4-!N4*9hPTdvj5z#L_cSy3b z>e@YRcHN- diff --git a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf index 741fdbe7..a4f92140 100644 --- a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf +++ b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf @@ -228,5 +228,5 @@ RomSpec File $(HWINFO_PRIVKEY) HostRoot $(TWL_IPL_RED_ROOT)/build/systemMenu_tools/NandInitializerRed/data Root /data - File camera_volatile_info.bin TWLFontTable.dat + File TWLFontTable.dat }