diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index 80532d31..e2f4c1e1 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -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); diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c index 3d4e0426..b6b1a07f 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c @@ -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(); diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c index 5edb3af2..3499a382 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c +++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c @@ -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(); diff --git a/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c b/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c index 1958bb39..b84aec28 100644 --- a/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c +++ b/build/tests/AppliCooperation/CooperationA/ARM9/src/CooperationA.c @@ -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(); diff --git a/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c b/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c index 26d1e248..4956ccde 100644 --- a/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c +++ b/build/tests/AppliCooperation/CooperationB/ARM9/src/CooperationB.c @@ -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(); diff --git a/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c b/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c index b951b3ec..75db8886 100644 --- a/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c +++ b/build/tests/AppliCooperation/CooperationC/ARM9/src/CooperationC.c @@ -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(); diff --git a/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c index b1ca8598..82bad73b 100644 --- a/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c +++ b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c @@ -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(); diff --git a/build/tests/RelocateChecker/ARM7/hyena_rc.lsf b/build/tests/RelocateChecker/ARM7/hyena_rc.lsf index 5a6ac2a9..d8d082c6 100644 --- a/build/tests/RelocateChecker/ARM7/hyena_rc.lsf +++ b/build/tests/RelocateChecker/ARM7/hyena_rc.lsf @@ -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 \ diff --git a/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf b/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf index 83be8a86..5ff632ed 100644 --- a/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf +++ b/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf @@ -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 \