From 266a6e8960a2398216833fd3f8aec971c915cdbd Mon Sep 17 00:00:00 2001 From: kamikawa Date: Fri, 29 Aug 2008 06:17:54 +0000 Subject: [PATCH] =?UTF-8?q?(NandInitializer*)=20LCFG=5FTHW=5FGetRegion()?= =?UTF-8?q?=E3=82=92OS=5FGetRegion()=E3=81=AB=E7=BD=AE=E3=81=8D=E6=8F=9B?= =?UTF-8?q?=E3=81=88=E3=80=82=EF=BC=88NAND=E3=82=92=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=81=99=E3=82=8B=E3=81=93?= =?UTF-8?q?=E3=81=A8=E3=81=AE=E5=BD=B1=E9=9F=BF=E3=82=92=E5=8F=97=E3=81=91?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81=E9=83=BD=E5=90=88=E3=81=8C?= =?UTF-8?q?=E3=82=88=E3=81=84=EF=BC=89=20(SystemUpdater)=20=E6=9B=B8?= =?UTF-8?q?=E3=81=8D=E8=BE=BC=E3=81=BF=E5=AF=BE=E8=B1=A1data=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=80=E3=82=92Makefile=E3=81=A7=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=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@2318 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../NandInitializerRed/ARM9.TWL/src/process_hw_info.c | 2 +- .../ARM9.TWL/src/process_wireless_setting.c | 4 ++-- build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf | 2 +- build/systemMenu_tools/SystemUpdater/Makefile | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c index 34df8db4..75c16063 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_hw_info.c @@ -124,7 +124,7 @@ void* HWInfoProcess0(void) kamiFontPrintf(3, 18, FONT_COLOR_BLACK, "+--------------------+----+"); // 現在のリージョンに"now"と表示 - kamiFontPrintf(26, (s16)(MENU_TOP_LINE+LCFG_THW_GetRegion()*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, "now"); + kamiFontPrintf(26, (s16)(MENU_TOP_LINE+OS_GetRegion()*CHAR_OF_MENU_SPACE), FONT_COLOR_BLACK, "now"); // 背景全クリア for (i=0;i<24;i++) diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c index 863ea002..855dc8c5 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/process_wireless_setting.c @@ -175,7 +175,7 @@ void* WirelessSettingProcess2(void) switch( sMenuSelectNo ) { case MENU_WIRELESS_ENABLE: - result = WriteHWInfoFile( LCFG_THW_GetRegion(), FALSE ); + result = WriteHWInfoFile( OS_GetRegion(), FALSE ); if ( result == TRUE ) { kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, "OK "); @@ -189,7 +189,7 @@ void* WirelessSettingProcess2(void) break; case MENU_WIRELESS_FORCE_OFF: - result = WriteHWInfoFile( LCFG_THW_GetRegion(), TRUE ); + result = WriteHWInfoFile( OS_GetRegion(), TRUE ); if ( result == TRUE ) { kamiFontPrintf(26, (s16)(MENU_TOP_LINE+MENU_WIRELESS_ENABLE*CHAR_OF_MENU_SPACE), FONT_COLOR_GREEN, " "); diff --git a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf index abb5c445..6fe56c1d 100644 --- a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf +++ b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/main.rsf @@ -220,7 +220,7 @@ RomSpec { Offset 0x00000000 Segment ALL - HostRoot ../data + HostRoot ../$(UPDATER_HOST_ROOT_DIR) Root /data File HNAA.tad HNBA.tad HNCA.tad HNHA.tad HNLA.tad \ menu_launcher.nand TWLFontTable.dat cert.sys diff --git a/build/systemMenu_tools/SystemUpdater/Makefile b/build/systemMenu_tools/SystemUpdater/Makefile index d931d7c0..f8a20aa5 100644 --- a/build/systemMenu_tools/SystemUpdater/Makefile +++ b/build/systemMenu_tools/SystemUpdater/Makefile @@ -29,8 +29,10 @@ DS_HASH_TABLE = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/DSHashTable SHARED_FONT_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/sharedFont NANDFIRM_DIR = $(TWL_IPL_RED_ROOT)/build/nandfirm/menu-launcher -# 既存データを使用する場合はTRUEを指定 +# systemMenuデータの作成をスキップする場合はTRUEを指定 SKIP_CREATE_DATA = FALSE +# 実際に書き込みたいファイルの置かれているdataフォルダを指定 +export UPDATER_HOST_ROOT_DIR = data ifeq ($(SKIP_CREATE_DATA),FALSE) SUBDIRS = $(LAUNCHER_DIR) \