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

tmpフォルダから起動するための準備

Browse Source 
LauncherParamのフラグで扱うOSBootTypeに対応

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@484 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2008-01-17 08:33:38 +00:00
parent 6a9d62b06e
commit bdb91608c0
9 changed files with 29 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
View File

@ -65,45 +65,6 @@ static TWLBannerFile s_bannerBuf[ LAUNCHER_TITLE_LIST_NUM ] ATTRIBUTE_ALIGN(32);
// const data------------------------------------------------------------------
typedef struct RomSegmentRange {
u32 start;
u32 end;
}RomSegmentRange;
static RomSegmentRange romSegmentRange[RELOCATE_INFO_NUM] = {
{ SYSM_TWL_ARM9_LOAD_MMEM, SYSM_TWL_ARM9_LOAD_MMEM_END },
{ SYSM_TWL_ARM7_LOAD_MMEM, SYSM_TWL_ARM7_LOAD_MMEM_END },
{ SYSM_TWL_ARM9_LTD_LOAD_MMEM, SYSM_TWL_ARM9_LTD_LOAD_MMEM_END },
{ SYSM_TWL_ARM7_LTD_LOAD_MMEM, SYSM_TWL_ARM7_LTD_LOAD_MMEM_END },
};
static RomSegmentRange romSegmentRangeNitro[RELOCATE_INFO_NUM] = {
{ SYSM_NTR_ARM9_LOAD_MMEM, SYSM_NTR_ARM9_LOAD_MMEM_END },
{ SYSM_NTR_ARM7_LOAD_MMEM, SYSM_NTR_ARM7_LOAD_MMEM_END },
{ SYSM_TWL_ARM9_LTD_LOAD_MMEM, SYSM_TWL_ARM9_LTD_LOAD_MMEM_END },
{ SYSM_TWL_ARM7_LTD_LOAD_MMEM, SYSM_TWL_ARM7_LTD_LOAD_MMEM_END },
};
static u32 load_region_check_list[RELOCATE_INFO_NUM][RELOCATE_INFO_NUM * 2 - 1] =
{
{SYSM_NTR_ARM7_LOAD_MMEM, SYSM_NTR_ARM7_LOAD_MMEM_END,
SYSM_TWL_ARM9_LTD_LOAD_MMEM, SYSM_TWL_ARM9_LTD_LOAD_MMEM_END,
SYSM_TWL_ARM7_LTD_LOAD_MMEM, SYSM_TWL_ARM7_LTD_LOAD_MMEM_END,
NULL },
{SYSM_NTR_ARM9_LOAD_MMEM, SYSM_NTR_ARM9_LOAD_MMEM_END,
SYSM_TWL_ARM9_LTD_LOAD_MMEM, SYSM_TWL_ARM9_LTD_LOAD_MMEM_END,
SYSM_TWL_ARM7_LTD_LOAD_MMEM, SYSM_TWL_ARM7_LTD_LOAD_MMEM_END,
NULL },
{SYSM_NTR_ARM9_LOAD_MMEM, SYSM_NTR_ARM9_LOAD_MMEM_END,
SYSM_NTR_ARM7_LOAD_MMEM, SYSM_NTR_ARM7_LOAD_MMEM_END,
SYSM_TWL_ARM7_LTD_LOAD_MMEM, SYSM_TWL_ARM7_LTD_LOAD_MMEM_END,
NULL },
{SYSM_NTR_ARM9_LOAD_MMEM, SYSM_NTR_ARM9_LOAD_MMEM_END,
SYSM_NTR_ARM7_LOAD_MMEM, SYSM_NTR_ARM7_LOAD_MMEM_END,
SYSM_TWL_ARM9_LTD_LOAD_MMEM, SYSM_TWL_ARM9_LTD_LOAD_MMEM_END,
NULL },
};
// ============================================================================
//
@ -551,7 +512,25 @@ static void SYSMi_LoadTitleThreadFunc( TitleProperty *pBootTitle )
FSFile file[1];
BOOL bSuccess;
BOOL isTwlApp = TRUE;
NAM_GetTitleBootContentPathFast(path, pBootTitle->titleID);
if(pBootTitle->flags.bootType == OS_BOOTTYPE_NAND)
{
// NAND
NAM_GetTitleBootContentPathFast(path, pBootTitle->titleID);
}
else if(pBootTitle->flags.bootType == OS_BOOTTYPE_ROM)
{
// TODO:CARD未読の場合の処理
}
else if(pBootTitle->flags.bootType == OS_BOOTTYPE_TEMP)
{
// tmpフォルダ
STD_TSNPrintf( path, 31, "nand:/tmp/%.16llx.srl", pBootTitle->titleID );
}
else
{
// unknown
return;
}
bSuccess = FS_OpenFileEx(file, path, FS_FILEMODE_R);

2
build/systemMenu_RED/Launcher/ARM9/src/launcher.c
View File

@ -509,7 +509,7 @@ static TitleProperty *ProcessPads( TitleProperty *pTitleList )
u16 dummy;
u16 tp_lr = 3;
TitleProperty *ret = NULL;
LauncherBootFlags tempflag = {TRUE, 0, TRUE, FALSE, FALSE, FALSE, 0};
LauncherBootFlags tempflag = {TRUE, OS_BOOTTYPE_NAND, TRUE, FALSE, FALSE, FALSE, 0};
// バックライト関係のキー処理
ProcessBackLightPads();

2
build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
View File

@ -188,7 +188,7 @@ int MachineSettingMain( void )
{
BOOL tp_select;
LauncherBootFlags tempflag = {TRUE, 0, TRUE, FALSE, FALSE, FALSE, 0};
LauncherBootFlags tempflag = {TRUE, OS_BOOTTYPE_NAND, TRUE, FALSE, FALSE, FALSE, 0};
ReadTP();

2
build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c
View File

@ -439,7 +439,7 @@ static void MenuScene(void)
{
BOOL tp_select = FALSE;
static TPData tgt = (TPData){0,0,0,0};
LauncherBootFlags tempflag = {TRUE, 0, TRUE, FALSE, FALSE, FALSE, 0};
LauncherBootFlags tempflag = {TRUE, OS_BOOTTYPE_NAND, TRUE, FALSE, FALSE, FALSE, 0};
ReadTP();

2
build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c
View File

@ -124,7 +124,7 @@ static void MenuInit( void )
static void MenuScene(void)
{
BOOL tp_select = FALSE;
LauncherBootFlags tempflag = {TRUE, 0, TRUE, FALSE, FALSE, FALSE, 0};
LauncherBootFlags tempflag = {TRUE, OS_BOOTTYPE_NAND, TRUE, FALSE, FALSE, FALSE, 0};
ReadTP();

2
build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c
View File

@ -439,7 +439,7 @@ static void MenuScene(void)
{
BOOL tp_select = FALSE;
static TPData tgt = (TPData){0,0,0,0};
LauncherBootFlags tempflag = {TRUE, 0, TRUE, FALSE, FALSE, FALSE, 0};
LauncherBootFlags tempflag = {TRUE, OS_BOOTTYPE_NAND, TRUE, FALSE, FALSE, FALSE, 0};
ReadTP();

2
build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c
View File

@ -134,7 +134,7 @@ static BOOL LoadTitle( NAMTitleId bootTitleID )
static void MenuScene(void)
{
BOOL tp_select = FALSE;
LauncherBootFlags tempflag = {TRUE, 0, TRUE, FALSE, TRUE, FALSE, 0};
LauncherBootFlags tempflag = {TRUE, OS_BOOTTYPE_NAND, TRUE, FALSE, TRUE, FALSE, 0};
ReadTP();

8
build/tests/RelocateChecker/ARM7/hyena_rc.lsf
View File

@ -58,10 +58,7 @@ Autoload WRAM
libreboot_sp$(LIBSUFFIX).a \
libcardboot_sp$(LIBSUFFIX).a \
Library libsdio_hcd_twl$(LIBSUFFIX).a \
libsdio_busdriver$(LIBSUFFIX).a \
libsdio_lib$(LIBSUFFIX).a \
libARM7athdrv$(LIBSUFFIX).a
Library libsdio_sp$(LIBSUFFIX).a
Object * (.etable)
Object * (.wram)
@ -139,8 +136,7 @@ Ltdautoload LTDMAIN
Object ../flabObj/ARM7LTD.fob
Library libnvram_sp$(LIBSUFFIX).a
Library librtc_sp$(LIBSUFFIX).a
Library librompatch_sp$(LIBSUFFIX).a \
libwm_sp$(LIBSUFFIX).a \
Library libwm_sp$(LIBSUFFIX).a \
libnwm_sp$(LIBSUFFIX).a \
libwvr_sp$(LIBSUFFIX).a \
libwl_sp$(LIBSUFFIX).a \

8
build/tests/RelocateChecker/ARM7/hyena_rc5.lsf
View File

@ -51,10 +51,7 @@ Static $(TARGET_NAME)
libreboot_sp$(LIBSUFFIX).a \
libcardboot_sp$(LIBSUFFIX).a \
Library libsdio_hcd_twl$(LIBSUFFIX).a \
libsdio_busdriver$(LIBSUFFIX).a \
libsdio_lib$(LIBSUFFIX).a \
libARM7athdrv$(LIBSUFFIX).a
Library libsdio_sp$(LIBSUFFIX).a
#####
# Sub-routines in WL library , that should be on WRAM.
@ -139,8 +136,7 @@ Ltdautoload LTDMAIN
Object ../flabObj/ARM7LTD.fob
Library libnvram_sp$(LIBSUFFIX).a
Library librtc_sp$(LIBSUFFIX).a
Library librompatch_sp$(LIBSUFFIX).a \
libwm_sp$(LIBSUFFIX).a \
Library libwm_sp$(LIBSUFFIX).a \
libnwm_sp$(LIBSUFFIX).a \
libwvr_sp$(LIBSUFFIX).a \
libwl_sp$(LIBSUFFIX).a \