From 04321729cfccd6b7d272909230aa2943a69a37dc Mon Sep 17 00:00:00 2001 From: kamikawa Date: Fri, 21 Nov 2008 10:58:47 +0000 Subject: [PATCH] =?UTF-8?q?WRITE=5FDEVKP=5FENABLE=E3=82=92=E5=AE=9A?= =?UTF-8?q?=E7=BE=A9=E3=81=99=E3=82=8B=E3=81=A8=E3=80=80dev.kp=20=E3=82=92?= =?UTF-8?q?=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=82=81=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=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@2700 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../ARM9.TWL/Makefile | 4 ++ .../NandInitializerRed/ARM9.TWL/Makefile | 4 ++ .../ARM9.TWL/include/process_write_data.h | 1 + .../ARM9.TWL/src/process_write_data.c | 43 ++++++++++++++----- 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile index e6042697..3d1b71f3 100644 --- a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile @@ -35,6 +35,10 @@ MACRO_FLAGS += -DUSE_WIRELESS_FORCE_DISABLE_SETTING MACRO_FLAGS += -DUSE_WRITE_VARIOUS_DATA #============================================================================ #============================================================================ +# dev.kpを書き込み可能にする場合定義します。（要:Make Clean） +MACRO_FLAGS += -DWRITE_DEVKP_ENABLE +#============================================================================ +#============================================================================ # マリクラデバッグ用として作成する場合定義します。（要:Make Clean） # ・自動処理において"nand:/shared2/launcher/wrap.bin"を作成します。 # ・自動処理において開発用CLSの証明書(cert.sys)を書き込みます。 diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile index 40abda10..6cea7dc1 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile @@ -31,6 +31,10 @@ MACRO_FLAGS += -DUSE_WIRELESS_FORCE_DISABLE_SETTING MACRO_FLAGS += -DUSE_WRITE_VARIOUS_DATA #============================================================================ #============================================================================ +# dev.kpを書き込み可能にする場合定義します。（要:Make Clean） +#MACRO_FLAGS += -DWRITE_DEVKP_ENABLE +#============================================================================ +#============================================================================ # マリクラデバッグ用として作成する場合定義します。（要:Make Clean） # ・自動処理において"nand:/shared2/launcher/wrap.bin"を作成します。 # ・自動処理において開発用CLSの証明書(cert.sys)を書き込みます。 diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_write_data.h b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_write_data.h index 97b9d2df..7edc18d2 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_write_data.h +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/include/process_write_data.h @@ -31,6 +31,7 @@ extern "C" { *---------------------------------------------------------------------------*/ #define FONT_DATA_FILE_PATH_IN_NAND "nand:sys/TWLFontTable.dat" #define WRAP_DATA_FILE_PATH_IN_NAND "nand:/shared2/launcher/wrap.bin" +#define DEVKP_DATA_FILE_PATH_IN_NAND "nand:/sys/dev.kp" #define CERT_DATA_FILE_PATH_IN_ROM "rom:/data/cert.sys" #define CERT_DATA_FILE_PATH_IN_NAND "nand:/sys/cert.sys" diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c index 9e8a5b72..d29b373e 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_write_data.c @@ -37,6 +37,9 @@ enum { MENU_FONT=0, MENU_WRAP, MENU_CERT, +#ifdef WRITE_DEVKP_ENABLE + MENU_DEVKP, +#endif MENU_RETURN, NUM_OF_MENU_SELECT }; @@ -64,7 +67,7 @@ static s8 sMenuSelectNo; *---------------------------------------------------------------------------*/ static BOOL WriteFontData(void); -static BOOL WriteWrapData(void); +static BOOL WriteDummyData(const char* nandpath); static BOOL WriteCertData(void); /*---------------------------------------------------------------------------* @@ -100,8 +103,15 @@ void* WriteDataProcess0(void) kamiFontPrintf(3, 10, FONT_COLOR_BLACK, "+-------------------+-----+"); kamiFontPrintf(3, 11, FONT_COLOR_BLACK, "l WRITE CERT.SYS l l"); kamiFontPrintf(3, 12, FONT_COLOR_BLACK, "+-------------------+-----+"); +#ifdef WRITE_DEVKP_ENABLE + kamiFontPrintf(3, 13, FONT_COLOR_BLACK, "l WRITE DEV.KP l l"); + kamiFontPrintf(3, 14, FONT_COLOR_BLACK, "+-------------------+-----+"); + kamiFontPrintf(3, 15, FONT_COLOR_BLACK, "l RETURN l l"); + kamiFontPrintf(3, 16, FONT_COLOR_BLACK, "+-------------------+-----+"); +#else kamiFontPrintf(3, 13, FONT_COLOR_BLACK, "l RETURN l l"); kamiFontPrintf(3, 14, FONT_COLOR_BLACK, "+-------------------+-----+"); +#endif // 背景全クリア for (i=0;i<24;i++) @@ -189,11 +199,17 @@ void* WriteDataProcess2(void) result = WriteFontData(); break; case MENU_WRAP: - result = WriteWrapData(); + // ダミーのDSメニューラッピング用ファイル作成（UIGランチャーが作っているもの） + result = WriteDummyData(WRAP_DATA_FILE_PATH_IN_NAND); break; case MENU_CERT: result = WriteCertData(); break; +#ifdef WRITE_DEVKP_ENABLE + case MENU_DEVKP: + result = WriteDummyData(DEVKP_DATA_FILE_PATH_IN_NAND); + break; +#endif case MENU_RETURN: FADE_OUT_RETURN( TopmenuProcess0 ); } @@ -218,13 +234,18 @@ void* WriteDataProcess2(void) { case MENU_FONT: case MENU_WRAP: -#ifdef MARIOCLUB_VERSION +#ifdef MARIOCLUB_VERSION sMenuSelectNo++; return WriteDataProcess2; -#endif // MARIOCLUB_VERSION +#endif //MARIOCLUB_VERSION case MENU_CERT: +#ifdef WRITE_DEVKP_ENABLE + sMenuSelectNo = MENU_DEVKP; + return WriteDataProcess2; + case MENU_DEVKP: +#endif //WRITE_DEVKP_ENABLE if (total_result) - { + { gAutoProcessResult[AUTO_PROCESS_MENU_VARIOUS_DATA] = AUTO_PROCESS_RESULT_SUCCESS; FADE_OUT_RETURN( AutoProcess1 ); } @@ -351,8 +372,8 @@ static BOOL WriteFontData(void) return result; } -// ダミーのDSメニューラッピング用ファイル作成（UIGランチャーが作っているもの） -static BOOL WriteWrapData(void) +// ダミーファイル作成 +static BOOL WriteDummyData(const char* nandpath) { FSFile file; BOOL open_is_ok; @@ -360,18 +381,18 @@ static BOOL WriteWrapData(void) // 既に存在するなら何もしない FS_InitFile(&file); - open_is_ok = FS_OpenFile(&file, WRAP_DATA_FILE_PATH_IN_NAND); + open_is_ok = FS_OpenFile(&file, nandpath); if (open_is_ok) { FS_CloseFile(&file); - OS_Printf("%s is already exist.\n", WRAP_DATA_FILE_PATH_IN_NAND); + OS_Printf("%s is already exist.\n", nandpath); return TRUE; } - if( FS_CreateFileAuto( WRAP_DATA_FILE_PATH_IN_NAND, FS_PERMIT_R | FS_PERMIT_W ) ) + if( FS_CreateFileAuto( nandpath, FS_PERMIT_R | FS_PERMIT_W ) ) { FSFile file; - if( FS_OpenFileEx( &file, WRAP_DATA_FILE_PATH_IN_NAND, FS_FILEMODE_RW ) ) + if( FS_OpenFileEx( &file, nandpath, FS_FILEMODE_RW ) ) { (void)FS_SetFileLength( &file, FATFS_CLUSTER_SIZE ); FS_CloseFile( &file );