rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

(更新:Akabane Jumpei)

Browse Source 
・Arm9常駐モジュールのサイズがSecure領域内におさまっている場合に対応
(Secure領域におさまっている場合はGame領域読み部分を飛ばす)

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@871 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
(no author) 2008-03-12 10:56:22 +00:00
parent 5628bb0a15
commit 714e5ea256
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
View File

@ -217,6 +217,7 @@ typedef enum HotSwState{
HOTSW_ID_CHECK_ERROR, HOTSW_ID_CHECK_ERROR,
HOTSW_PULLED_OUT_ERROR, HOTSW_PULLED_OUT_ERROR,
HOTSW_DATA_DECRYPT_ERROR, HOTSW_DATA_DECRYPT_ERROR,
HOTSW_BUFFER_OVERRUN_ERROR,
HOTSW_UNEXPECTED_ERROR HOTSW_UNEXPECTED_ERROR
} HotSwState; } HotSwState;

32
build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
View File

@ -602,10 +602,16 @@ static HotSwState LoadStaticModule(void)
s_cbData.arm9Stc = (u32)s_cbData.pBootSegBuf->rh.s.main_ram_address; s_cbData.arm9Stc = (u32)s_cbData.pBootSegBuf->rh.s.main_ram_address;
// 配置先と再配置情報を取得 & Arm9の常駐モジュール残りを指定先に転送 // 配置先と再配置情報を取得 & Arm9の常駐モジュール残りを指定先に転送
SYSM_CheckLoadRegionAndSetRelocateInfo( ARM9_STATIC, &s_cbData.arm9Stc, s_cbData.pBootSegBuf->rh.s.main_size, &SYSMi_GetWork()->romRelocateInfo[ARM9_STATIC] , s_cbData.twlFlg); if(SYSM_CheckLoadRegionAndSetRelocateInfo( ARM9_STATIC, &s_cbData.arm9Stc, s_cbData.pBootSegBuf->rh.s.main_size, &SYSMi_GetWork()->romRelocateInfo[ARM9_STATIC] , s_cbData.twlFlg)){
retval = ReadPageGame(&s_cbData, s_cbData.pBootSegBuf->rh.s.main_rom_offset + SECURE_SEGMENT_SIZE, if(s_cbData.pBootSegBuf->rh.s.main_size > SECURE_SEGMENT_SIZE){
(u32 *)(s_cbData.arm9Stc + SECURE_SEGMENT_SIZE), retval = ReadPageGame(&s_cbData, s_cbData.pBootSegBuf->rh.s.main_rom_offset + SECURE_SEGMENT_SIZE,
s_cbData.pBootSegBuf->rh.s.main_size - SECURE_SEGMENT_SIZE); (u32 *)(s_cbData.arm9Stc + SECURE_SEGMENT_SIZE),
s_cbData.pBootSegBuf->rh.s.main_size - SECURE_SEGMENT_SIZE);
}
}
else{
retval = HOTSW_BUFFER_OVERRUN_ERROR;
}
if(retval != HOTSW_SUCCESS){ if(retval != HOTSW_SUCCESS){
return retval; return retval;
@ -613,10 +619,14 @@ static HotSwState LoadStaticModule(void)
s_cbData.arm7Stc = (u32)s_cbData.pBootSegBuf->rh.s.sub_ram_address; s_cbData.arm7Stc = (u32)s_cbData.pBootSegBuf->rh.s.sub_ram_address;
// 配置先と再配置情報を取得 & Arm7の常駐モジュールを指定先に転送 // 配置先と再配置情報を取得 & Arm7の常駐モジュールを指定先に転送
SYSM_CheckLoadRegionAndSetRelocateInfo( ARM7_STATIC, &s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size, &SYSMi_GetWork()->romRelocateInfo[ARM7_STATIC] , s_cbData.twlFlg); if(SYSM_CheckLoadRegionAndSetRelocateInfo( ARM7_STATIC, &s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size, &SYSMi_GetWork()->romRelocateInfo[ARM7_STATIC] , s_cbData.twlFlg)){
state = ReadPageGame(&s_cbData, s_cbData.pBootSegBuf->rh.s.sub_rom_offset, (u32 *)s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size); state = ReadPageGame(&s_cbData, s_cbData.pBootSegBuf->rh.s.sub_rom_offset, (u32 *)s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size);
retval = (retval == HOTSW_SUCCESS) ? state : retval; retval = (retval == HOTSW_SUCCESS) ? state : retval;
}
else{
retval = HOTSW_BUFFER_OVERRUN_ERROR;
}
if(retval != HOTSW_SUCCESS){ if(retval != HOTSW_SUCCESS){
return retval; return retval;
} }
@ -1615,9 +1625,13 @@ static void DebugPrintErrorMessage(HotSwState state)
case HOTSW_DATA_DECRYPT_ERROR: case HOTSW_DATA_DECRYPT_ERROR:
OS_PutString(" - Error 7 : Data Decrypt\n"); OS_PutString(" - Error 7 : Data Decrypt\n");
break; break;
case HOTSW_BUFFER_OVERRUN_ERROR:
OS_PutString(" - Error 8 : Buffer OverRun\n");
break;
case HOTSW_UNEXPECTED_ERROR: case HOTSW_UNEXPECTED_ERROR:
OS_PutString(" - Error 8 : Unexpected\n"); OS_PutString(" - Error 9 : Unexpected\n");
break; break;
default : default :