SystemUpdater及びNandInitializer*使用時に既存のシリアルNoの先頭が'T'であれば数字8桁部分を保持するように修正。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2307 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
kamikawa 2008-08-28 07:22:03 +00:00
parent a0a9e162ad
commit 3eea43f948
2 changed files with 7 additions and 7 deletions

View File

@ -128,11 +128,11 @@ void HWInfoWriterInit( void )
}
// 無線強制ON/OFF情報の表示
s_isDisableWireless = LCFG_THW_IsForceDisableWireless();
s_isDisableWireless = OS_IsForceDisableWireless();
PrintfSJIS( 3 * 8, 2 * 8, TXT_COLOR_BLACK, pWireless[ s_isDisableWireless ] );
OS_TPrintf( "region = %d\n", LCFG_THW_GetRegion() );
PrintfSJISSub( 2 * 8, 16 * 8, TXT_COLOR_BLACK, "Region = %s", strRegion[ LCFG_THW_GetRegion() ] );
OS_TPrintf( "region = %d\n", OS_GetRegion() );
PrintfSJISSub( 2 * 8, 16 * 8, TXT_COLOR_BLACK, "Region = %s", strRegion[ OS_GetRegion() ] );
PrintfSJISSub( 2 * 8, 18 * 8, TXT_COLOR_BLACK, "SerialNo = %s", LCFG_THW_GetSerialNoPtr() );
if ( 1 )
{
@ -143,7 +143,7 @@ void HWInfoWriterInit( void )
for( i = 0; i < 4; i++ ) gameCode[ i ] = titleID_Lo[ 4 - i - 1 ];
PrintfSJISSub( 2 * 8, 20 * 8, TXT_COLOR_BLACK, "LauncherTitleID_Lo = %s", gameCode );
}
s_region_old = LCFG_THW_GetRegion();
s_region_old = OS_GetRegion();
s_csr = 0;
DrawMenu( s_csr, &s_writerParam );

View File

@ -384,7 +384,7 @@ BOOL HWI_WriteHWNormalInfoFile( void )
u8 serialNo[ LCFG_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN ];
MI_CpuClear8( serialNo, LCFG_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN );
LCFG_THW_GetSerialNo( serialNo );
OS_GetSerialNo( serialNo );
for( i = 0; i < LCFG_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN; i++ ) {
Info.movableUniqueID[ i ] = (u8)( serialNo[ i ] ^ s_serialNo_mask[ i ] );
@ -432,7 +432,7 @@ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWi
LCFG_THW_SetFlagForceDisableWireless( isDisableWireless );
// 旧リージョンを保存
old_region = LCFG_THW_GetRegion();
old_region = OS_GetRegion();
// リージョンのセット
LCFG_THW_SetRegion( region );
@ -463,7 +463,7 @@ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWi
}
// 現在のシリアルNo取得
LCFG_THW_GetSerialNo( serialNoOld );
OS_GetSerialNo( serialNoOld );
// 新しいシリアルNoをクリアしておく
MI_CpuClear8( serialNoNew, sizeof(serialNoNew) );