From 0b29dbf56e7d9fcba0fe3e1d4be2143122487d63 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Thu, 27 Mar 2008 02:22:09 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=81=AE=E4=BB=A3=E3=82=8F=E3=82=8A=E3=81=AB?= =?UTF-8?q?=E6=97=A5=E4=BB=98=E3=82=92=E3=81=84=E3=82=8C=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=20=E7=B0=A1?= =?UTF-8?q?=E6=98=93=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=AF=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=A7=E3=80=8CFORMAT=E3=80=8D=E3=81=A8=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=BE=E3=81=97=E3=81=9F=E3=81=8C=E5=AE=9F=E9=9A=9B?= =?UTF-8?q?=E3=81=AE=E5=8B=95=E4=BD=9C=E3=81=A8=E4=B9=96=E9=9B=A2=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=81=9F=E3=82=81=E3=80=8CClean=20U?= =?UTF-8?q?p=E3=80=8D=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82=20SD=E3=82=AB=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E6=8C=BF=E6=8A=9C=E3=82=A4=E3=83=99=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=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@973 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../NandInitializer/ARM9.TWL/src/font_data.c | 7 ++++--- .../NandInitializer/ARM9.TWL/src/graphics.c | 4 ++-- .../systemMenu_RED/NandInitializer/ARM9.TWL/src/main.c | 10 +--------- .../NandInitializer/ARM9.TWL/src/process_format.c | 2 +- .../NandInitializer/ARM9.TWL/src/process_hw_info.c | 6 ------ .../NandInitializer/ARM9.TWL/src/process_topmenu.c | 5 +++-- 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/font_data.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/font_data.c index 19003304..e9732d7a 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/font_data.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/font_data.c @@ -11,8 +11,8 @@ in whole or in part, without the prior written consent of Nintendo. $Date:: $ - $Rev:$ - $Author:$ + $Rev$ + $Author$ *---------------------------------------------------------------------------*/ #include @@ -99,6 +99,7 @@ const u16 PlttDataMain[16][16] = { {RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31),}, // White }; +// 下画面コンソール文字列パレット const u16 PlttDataSub[16][16] = { {RGB555(31, 31, 31), RGB555( 0, 0, 0), RGB555(25, 25, 25), RGB555(31, 31, 31),}, // Black {RGB555(31, 31, 31), RGB555(21, 0, 0), RGB555(31, 0, 0), RGB555(31, 0, 0),}, // Red @@ -108,7 +109,7 @@ const u16 PlttDataSub[16][16] = { {RGB555(31, 31, 31), RGB555(0, 21, 21), RGB555(0, 31, 31), RGB555(0, 31, 31),}, // Cyan {RGB555(31, 31, 31), RGB555(21, 0, 21), RGB555(31, 0, 31), RGB555(31, 0, 31),}, // Purple {RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31),}, // White - {RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31),}, // White + {RGB555(31, 31, 31), RGB555(20, 20, 20), RGB555(20, 20, 20), RGB555(20, 20, 20),}, // Gray {RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31),}, // White {RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31),}, // White {RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31), RGB555(31, 31, 31),}, // White diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/graphics.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/graphics.c index 9239b235..1de138e9 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/graphics.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/graphics.c @@ -11,8 +11,8 @@ in whole or in part, without the prior written consent of Nintendo. $Date:: $ - $Rev:$ - $Author:$ + $Rev$ + $Author$ *---------------------------------------------------------------------------*/ #include diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/main.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/main.c index 0be86df7..a18fce1b 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/main.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/main.c @@ -87,16 +87,8 @@ TwlMain() // initialize file-system FS_Init(FS_DMA_NOT_USE); // SDカードの挿抜イベント監視コールバック設定 - FS_RegisterEventHook("sdmc", &sSDHook, SDEvents, NULL); +// FS_RegisterEventHook("sdmc", &sSDHook, SDEvents, NULL); - - // SD起動などあらゆるマウント状態に対応する -/* - FATFS_UnmountDrive("F:"); - FATFS_UnmountDrive("G:"); - FATFS_MountDrive("F", FATFS_MEDIA_TYPE_NAND, 0); - FATFS_MountDrive("G", FATFS_MEDIA_TYPE_SD, 0); -*/ // NAMライブラリ初期化 NAM_Init( OS_AllocFromMain, OS_FreeToMain); diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_format.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_format.c index 0e2f88f0..0a2d3822 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_format.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_format.c @@ -99,7 +99,7 @@ void* FormatProcess0(void) // メニュー一覧 kamiFontPrintf(3, 6, FONT_COLOR_BLACK, "+-------------------+-----+"); - kamiFontPrintf(3, 7, FONT_COLOR_BLACK, "l FORMAT l l"); + kamiFontPrintf(3, 7, FONT_COLOR_BLACK, "l NAND Clean Up l l"); kamiFontPrintf(3, 8, FONT_COLOR_BLACK, "+-------------------+-----+"); kamiFontPrintf(3, 9, FONT_COLOR_BLACK, "l CHECK DISK l l"); kamiFontPrintf(3, 10, FONT_COLOR_BLACK, "+-------------------+-----+"); diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c index 6f549aad..61003701 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c @@ -91,12 +91,6 @@ static BOOL s_isReadTSD; 内部関数宣言 *---------------------------------------------------------------------------*/ -void HWInfoWriterInit( void ); -static void ReadTWLSettings( void ); -static void ModifyLanguage( u8 region ); -static void ReadPrivateKey( void ); -static void ReadHWInfoFile( void ); -static void VerifyHWInfo( void ); static BOOL WriteHWInfoFile( u8 region ); static BOOL WriteHWNormalInfoFile( void ); static BOOL WriteHWSecureInfoFile( u8 region ); diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_topmenu.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_topmenu.c index 52a4472d..2e446f49 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_topmenu.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_topmenu.c @@ -84,10 +84,11 @@ void* TopmenuProcess0(void) // バージョン表示 #ifndef NAND_FORMATTER_MODE - kamiFontPrintf(4, 2, 0, "Nand Initializer ver 0.1"); + kamiFontPrintf(8, 2, 0, "Nand Initializer"); #else - kamiFontPrintf(4, 2, 0, "Nand Formatter ver 0.1"); + kamiFontPrintf(9, 2, 0, "Nand Formatter"); #endif + kamiFontPrintf(9, 4, 8, "<%s>", __DATE__); // メニュー一覧 kamiFontPrintf(3, 7, FONT_COLOR_BLACK, " FORMAT NAND ");