(NandInitializer*) LCFG_THW_GetRegion()をOS_GetRegion()に置き換え。(NANDをフォーマットすることの影響を受けないため都合がよい)

(SystemUpdater) 書き込み対象dataフォルダをMakefileで指定できるように変更。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2318 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa 2008-08-29 06:17:54 +00:00
parent 43f27f32c7
commit 266a6e8960
4 changed files with 7 additions and 5 deletions

View File

@ -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++)

View File

@ -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, " ");

View File

@ -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

View File

@ -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) \