From 549807acfe36f7373378b464e1159da72a7759de Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Fri, 28 Dec 2007 03:59:54 +0000 Subject: [PATCH] =?UTF-8?q?MAKETADFLAG=E8=BF=BD=E5=8A=A0=20=E3=83=A9?= =?UTF-8?q?=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=E3=82=92NAND=E3=81=AB?= =?UTF-8?q?=E5=85=A5=E3=82=8C=E3=82=8B=E6=99=82=E8=A6=8B=E3=81=A5=E3=82=89?= =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E3=83=90=E3=83=8A?= =?UTF-8?q?=E3=83=BC=E8=BF=BD=E5=8A=A0=20=E3=83=97=E3=83=AA=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=97=E3=81=9F=E3=82=A2=E3=83=97=E3=83=AA?= =?UTF-8?q?=E3=82=92=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E8=B5=B7=E5=8B=95=E3=81=95=E3=81=9B=E3=82=8B=E3=83=87=E3=83=A2?= =?UTF-8?q?=E3=81=AE=E9=9B=9B=E5=BD=A2=E8=BF=BD=E5=8A=A0=20=E5=86=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=83=87=E3=83=A2=E3=81=AE=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E3=81=A8=E9=85=8D=E7=BD=AE=E5=BE=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@421 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/buildtools/modulerules.sysmenu | 2 +- build/systemMenu_RED/Launcher/ARM9/Makefile | 1 + build/systemMenu_RED/Launcher/ARM9/main.rsf | 2 +- .../Launcher/ARM9/src/launcher.c | 5 + build/systemMenu_RED/Launcher/Makefile | 2 +- build/systemMenu_RED/Launcher/banner/Makefile | 49 +++++ .../Launcher/banner/banner_v3.bsf | Bin 0 -> 750 bytes .../Launcher/banner/icon/gameIcon.bmp | Bin 0 -> 630 bytes .../MachineSettings/ARM9/Makefile | 1 + build/systemMenu_RED/PictoChat/ARM9/Makefile | 1 + build/tests/ExecPreLoadedApp/ARM9/ARM9-TS.lsf | 54 +++++ build/tests/ExecPreLoadedApp/ARM9/Makefile | 66 +++++++ build/tests/ExecPreLoadedApp/ARM9/main.rsf | 184 ++++++++++++++++++ .../ARM9/src/ExecPreLoadedApp.c | 180 +++++++++++++++++ .../ARM9/src/ExecPreLoadedApp.h | 37 ++++ build/tests/ExecPreLoadedApp/ARM9/src/main.c | 109 +++++++++++ build/tests/ExecPreLoadedApp/Makefile | 30 +++ build/tests/ExecPreLoadedApp/banner/Makefile | 49 +++++ .../ExecPreLoadedApp/banner/banner_v3.bsf | Bin 0 -> 1092 bytes .../ExecPreLoadedApp/banner/icon/gameIcon.bmp | Bin 0 -> 630 bytes build/tests/Makefile | 2 +- build/tests/RelocateChecker/ARM7/Makefile.0 | 4 +- build/tests/RelocateChecker/ARM7/Makefile.2 | 6 +- build/tests/RelocateChecker/ARM7/Makefile.4 | 2 +- .../ARM7/hyena_rc2.lcf.template | 2 +- build/tests/RelocateChecker/ARM9/Makefile.0 | 4 +- build/tests/RelocateChecker/ARM9/Makefile.2 | 4 +- build/tests/RelocateChecker/ARM9/Makefile.4 | 2 +- .../RelocateChecker/ARM9/rc2.lcf.template | 2 +- 29 files changed, 783 insertions(+), 17 deletions(-) create mode 100644 build/systemMenu_RED/Launcher/banner/Makefile create mode 100644 build/systemMenu_RED/Launcher/banner/banner_v3.bsf create mode 100644 build/systemMenu_RED/Launcher/banner/icon/gameIcon.bmp create mode 100644 build/tests/ExecPreLoadedApp/ARM9/ARM9-TS.lsf create mode 100644 build/tests/ExecPreLoadedApp/ARM9/Makefile create mode 100644 build/tests/ExecPreLoadedApp/ARM9/main.rsf create mode 100644 build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.c create mode 100644 build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.h create mode 100644 build/tests/ExecPreLoadedApp/ARM9/src/main.c create mode 100644 build/tests/ExecPreLoadedApp/Makefile create mode 100644 build/tests/ExecPreLoadedApp/banner/Makefile create mode 100644 build/tests/ExecPreLoadedApp/banner/banner_v3.bsf create mode 100644 build/tests/ExecPreLoadedApp/banner/icon/gameIcon.bmp diff --git a/build/buildtools/modulerules.sysmenu b/build/buildtools/modulerules.sysmenu index 35c237ac..973fac58 100644 --- a/build/buildtools/modulerules.sysmenu +++ b/build/buildtools/modulerules.sysmenu @@ -25,7 +25,7 @@ include $(NITROSYSTEM_ROOT)/build/buildtools/modulerules %.tad: $(BINDIR)/$(TARGET_BIN) - $(MAKETAD) $< -o $@ + $(MAKETAD) $< $(MAKETAD_FLAGS) -o $@ # .rbin $(BINDIR)/$(TARGET_BIN_BASENAME).rbin: $(OBJS) diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 194c8407..2cb15d0b 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -61,6 +61,7 @@ ADDRESS_DTCM = 0x0e000000 DEFAULT_COMP_ARM7 = hyena MAKEROM_FLAGS += -F -DTITLEID_LO='$(TITLEID_LO)' +MAKETAD_FLAGS += -s include $(TWLSDK_ROOT)/add-ins/es/commondefs.es include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 144dfc1d..837cfa37 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -95,7 +95,7 @@ Property # BANNER FILE: generated from Banner Spec File # #BannerFile ./etc/myGameBanner.bnr - BannerFile $(TWLSDK_ROOT)/include/twl/specfiles/default.bnr + BannerFile ../banner/banner.bnr ### ### Setting for TWL diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c index b2d06b19..3d4e0426 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c @@ -509,6 +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}; // バックライト関係のキー処理 ProcessBackLightPads(); @@ -530,6 +531,10 @@ static TitleProperty *ProcessPads( TitleProperty *pTitleList ) { s_wavstop = FALSE; } + + if( pad.trg & PAD_BUTTON_B ) { + OS_SetLauncherParamAndResetHardware( 0, NULL, &tempflag ); + } if(pad.cont & PAD_KEY_RIGHT || tp_lr == 1){ // バナー選択 if(csr_v == 0) csr_v = 1; diff --git a/build/systemMenu_RED/Launcher/Makefile b/build/systemMenu_RED/Launcher/Makefile index 02cacbf9..9cf34e12 100644 --- a/build/systemMenu_RED/Launcher/Makefile +++ b/build/systemMenu_RED/Launcher/Makefile @@ -20,7 +20,7 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBDIRS = ARM9 +SUBDIRS = banner ARM9 #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/Launcher/banner/Makefile b/build/systemMenu_RED/Launcher/banner/Makefile new file mode 100644 index 00000000..ea261271 --- /dev/null +++ b/build/systemMenu_RED/Launcher/banner/Makefile @@ -0,0 +1,49 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: 2007-10-03#$ +# $Rev: 1319 $ +# $Author: kitase_hirotake $ +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + +ICON_DIR = ./icon + +BANNER_ICON = $(ICON_DIR)/gameIcon.bmp +BANNER_SPEC = banner_v3.bsf + +TARGETS = banner.bnr +INSTALL_DIR = ./ +INSTALL_TARGETS = $(TARGETS) + +BANNER_ICON_NAME = $(basename $(BANNER_ICON)) + +LDIRT_CLEAN = $(TARGETS) \ + $(BANNER_ICON_NAME).nbfs \ + $(BANNER_ICON_NAME).nbfc \ + $(BANNER_ICON_NAME).nbfp \ + $(TARGETS:.bnr=.srl) + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + +#---------------------------------------------------------------------------- +# build +#---------------------------------------------------------------------------- +do-build: $(TARGETS) + +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) + $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ + $(MAKEBANNER) -d -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) + +# diff --git a/build/systemMenu_RED/Launcher/banner/banner_v3.bsf b/build/systemMenu_RED/Launcher/banner/banner_v3.bsf new file mode 100644 index 0000000000000000000000000000000000000000..975188c413c529ca945bd6c97b678a9af2ad4214 GIT binary patch literal 750 zcmc(dKT88a5XE1cfZt)^>gbA)BBhe^4?)CJ`^`nkK@#QelHkYlvshW%O7u5-S0*VV z3&YNPGqZ1I=XaCnT$xfi_2O~(K?}~aO3+Mi+;VQI3eC75sjH-oZgLJ|n|GZaG(|~; zqL)^Y(_BlC8f=V0r#0FO{2Fh8UqqXe8DJ_FCRU`w#!=f4reX-9~goUrTbVL#tt2s{5VXC7D)jTi!KO*~Mk8ifwrp zd$e5b;Y@4N&ff7aW!%4tT?_I5Cd^^1ckC3uW*-MS;jEcbNz_EgM9yG>R?N=!Ab{oY KbKq!9h)L-xG#M2s-fc=Kn%inSNCI7SDaqcYnLC-?CAX?j zyuU!3(WzPxt&`39E(xd~+$F!fFYkNFH4oiY$mHU_gKMi;E3k%lsG^=jzNdI8m&;JA z)u7R6fN7f0YPF!4>H01Ea z_t;`#A7v4W1MjL!>F0-`Yg&C7osN9(Yhl}%qg68wJU5?VFXJ%qJt^}c>&y65hElP# zq^{SOyo2mZ=}01*Mm^=7=q3!L#Luz{jzWyUsY%ncupTP|MmV%-S?ObkNBE;qj2+(ZEo6PQ-E*Plb5I7qSSFqE!gNiw +#include +#include "misc.h" +#include "ExecPreLoadedApp.h" + +// define data------------------------------------------ +#define RETURN_BUTTON_TOP_X 2 +#define RETURN_BUTTON_TOP_Y 21 +#define RETURN_BUTTON_BOTTOM_X ( RETURN_BUTTON_TOP_X + 8 ) +#define RETURN_BUTTON_BOTTOM_Y ( RETURN_BUTTON_TOP_Y + 2 ) + +#define MLEP_MENU_ELEMENT_NUM 7 // メニューの項目数 + +#define PARAM_LENGTH 10 + +// extern data------------------------------------------ + +// function's prototype declaration--------------------- + +static void MenuScene( void ); + +// global variable ------------------------------------- +extern RTCDrawProperty g_rtcDraw; + +// static variable ------------------------------------- +static u16 s_csr = 0; +static void(*s_pNowProcess)(void); + +// const data ----------------------------------------- +static const u16 *s_pStrMenu[ MLEP_MENU_ELEMENT_NUM ] = +{ + L"再配置チェッカ0（再配置無し）", + L"再配置チェッカ1（逆順コピー）", + L"再配置チェッカ2（正順コピー1）", + L"再配置チェッカ3（正順コピー2）", + L"再配置チェッカ4（エラー）", + L"再配置チェッカ5（WRAMへ配置）", + L"ランチャーに戻る", +}; + +static MenuPos s_menuPos[] = { + { TRUE, 4 * 8, 8 * 8 }, + { TRUE, 4 * 8, 10 * 8 }, + { TRUE, 4 * 8, 12 * 8 }, + { TRUE, 4 * 8, 14 * 8 }, + { TRUE, 4 * 8, 16 * 8 }, + { TRUE, 4 * 8, 18 * 8 }, + { TRUE, 4 * 8, 20 * 8 }, +}; + +static const MenuParam s_menuParam = { + MLEP_MENU_ELEMENT_NUM, + TXT_COLOR_BLACK, + TXT_COLOR_GREEN, + TXT_COLOR_RED, + &s_menuPos[ 0 ], + (const u16 **)&s_pStrMenu, +}; + +//====================================================== +// テストプログラム +//====================================================== + +static void DrawMenuScene( void ) +{ + PutStringUTF16( 1 * 8, 0 * 8, TXT_COLOR_BLUE, (const u16 *)L"ExecPreLoadedApp"); + // メニュー項目 + DrawMenu( s_csr, &s_menuParam ); +} + +static void MenuInit( void ) +{ + GX_DispOff(); + GXS_DispOff(); + NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_WHITE ); + + PutStringUTF16( 1 * 8, 0 * 8, TXT_COLOR_BLUE, (const u16 *)L"ExecPreLoadedApp"); + GetAndDrawRTCData( &g_rtcDraw, TRUE ); + + SVC_CpuClear( 0x0000, &tpd, sizeof(TpWork), 16 ); + + GXS_SetVisiblePlane( GX_PLANEMASK_BG0 ); + + s_pNowProcess = MenuScene; + + DrawMenuScene(); + + GX_DispOn(); + GXS_DispOn(); +} + +static void MenuScene(void) +{ + BOOL tp_select = FALSE; + LauncherBootFlags tempflag = {TRUE, 0, TRUE, FALSE, FALSE, FALSE, 0}; + + ReadTP(); + + //-------------------------------------- + // キー入力処理 + //-------------------------------------- + if( pad.trg & PAD_KEY_DOWN ){ // カーソルの移動 + if( ++s_csr == MLEP_MENU_ELEMENT_NUM ) { + s_csr=0; + } + } + if( pad.trg & PAD_KEY_UP ){ + if( --s_csr & 0x80 ) { + s_csr=MLEP_MENU_ELEMENT_NUM - 1; + } + } + tp_select = SelectMenuByTP( &s_csr, &s_menuParam ); + + DrawMenuScene(); + + if( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) { // メニュー項目への分岐 + if( s_menuPos[ s_csr ].enable ) { + switch( s_csr ) { + case 0: + //アプリ起動 + OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b30, &tempflag ); // RCK0 + break; + case 1: + //アプリ起動 + OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b31, &tempflag ); // RCK1 + break; + case 2: + //アプリ起動 + OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b32, &tempflag ); // RCK2 + break; + case 3: + //アプリ起動 + OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b33, &tempflag ); // RCK3 + break; + case 4: + //アプリ起動 + OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b34, &tempflag ); // RCK4 + break; + case 5: + //アプリ起動 + OS_SetLauncherParamAndResetHardware( 0, 0x0001000152434b35, &tempflag ); // RCK5 + break; + case 6: + OS_SetLauncherParamAndResetHardware( 0, NULL, &tempflag ); + //再起動 + break; + } + } + } +} + +// 初期化 +void ExecPreLoadedAppInit( void ) +{ + ChangeUserColor( TSD_GetUserColor() ); + MenuInit(); +} + +// メインループ +void ExecPreLoadedAppMain(void) +{ + s_pNowProcess(); +} diff --git a/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.h b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.h new file mode 100644 index 00000000..aa427c35 --- /dev/null +++ b/build/tests/ExecPreLoadedApp/ARM9/src/ExecPreLoadedApp.h @@ -0,0 +1,37 @@ +/*---------------------------------------------------------------------------* + Project: TwlIPL + File: ExecPreLoadedApp.h + + Copyright 2007 Nintendo. All rights reserved. + + These coded instructions, statements, and computer programs contain + proprietary information of Nintendo of America Inc. and/or Nintendo + Company Ltd., and are protected by Federal copyright law. They may + not be disclosed to third parties or copied or duplicated in any form, + in whole or in part, without the prior written consent of Nintendo. + + $Date:: 2007-10-30#$ + $Rev: 73 $ + $Author: yosiokat $ + *---------------------------------------------------------------------------*/ + +#ifndef __COOPERATION_B_H__ +#define __COOPERATION_B_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +#include + +// define data---------------------------------------------------------- + +void ExecPreLoadedAppInit( void ); +void ExecPreLoadedAppMain( void ); + +#ifdef __cplusplus +} +#endif + +#endif // __COOPERATION_B_H__ diff --git a/build/tests/ExecPreLoadedApp/ARM9/src/main.c b/build/tests/ExecPreLoadedApp/ARM9/src/main.c new file mode 100644 index 00000000..d7ea4285 --- /dev/null +++ b/build/tests/ExecPreLoadedApp/ARM9/src/main.c @@ -0,0 +1,109 @@ +/*---------------------------------------------------------------------------* + Project: TwlIPL + File: main.c + + Copyright 2007 Nintendo. All rights reserved. + + These coded instructions, statements, and computer programs contain + proprietary information of Nintendo of America Inc. and/or Nintendo + Company Ltd., and are protected by Federal copyright law. They may + not be disclosed to third parties or copied or duplicated in any form, + in whole or in part, without the prior written consent of Nintendo. + + $Date:: 2007-11-27#$ + $Rev: 272 $ + $Author: yosiokat $ + *---------------------------------------------------------------------------*/ + +#include +#include "misc.h" +#include "ExecPreLoadedApp.h" + +// extern data----------------------------------------------------------------- + +// define data----------------------------------------------------------------- + +// function's prototype------------------------------------------------------- +static void INTR_VBlank( void ); + +// global variable------------------------------------------------------------- + +// static variable------------------------------------------------------------- +BOOL g_isValidTSD; +RTCDrawProperty g_rtcDraw = { + TRUE, RTC_DATE_TOP_X, RTC_DATE_TOP_Y, RTC_TIME_TOP_X, RTC_TIME_TOP_Y +}; + +// const data------------------------------------------------------------------ + + +// ============================================================================ +// function's description +// ============================================================================ +void TwlMain(void) +{ + + // 初期化---------------------------------- + OS_Init(); + OS_InitTick(); + + (void)OS_EnableIrq(); + (void)OS_EnableInterrupts(); + + GX_Init(); + GX_SetPower(GX_POWER_ALL); // 各ロジック パワーON + FS_Init( 3 ); + + // 割り込み許可---------------------------- + (void)OS_SetIrqFunction(OS_IE_V_BLANK, INTR_VBlank); + (void)OS_EnableIrqMask(OS_IE_V_BLANK); + (void)GX_VBlankIntr(TRUE); + + // デバイス初期化------------------------------- + TP_Init(); + (void)RTC_Init(); + + // システムの初期化------------------ + InitAllocator(); + + // ※本来ならランチャーからのパラメータチェックを行い、 + // 初回起動シーケンスに入るパスがある + + // TWL設定のリード + SYSM_SetAllocFunc( Alloc, Free ); // SYSM_ReadTWLSettingsFile()の実行に必要。 + + // :::::::::::::::::::::::::::::::::::::::::::::: + // TWL設定データファイルの読み込み + // :::::::::::::::::::::::::::::::::::::::::::::: + (void)THW_ReadSecureInfo(); + g_isValidTSD = SYSM_ReadTWLSettingsFile(); + if( g_isValidTSD ) { + SYSM_CaribrateTP(); + } + + InitBG(); + GetAndDrawRTCData( &g_rtcDraw, TRUE ); + + ExecPreLoadedAppInit(); + // メインループ---------------------------- + while(1){ + OS_WaitIrq(1, OS_IE_V_BLANK); // Vブランク割り込み待ち + + ReadKeyPad(); // キー入力の取得 + ReadTP(); // TP入力の取得 + + ExecPreLoadedAppMain(); + } +} + + +// ============================================================================ +// 割り込み処理 +// ============================================================================ + +// Vブランク割り込み +static void INTR_VBlank(void) +{ + OS_SetIrqCheckFlag(OS_IE_V_BLANK); // Vブランク割込チェックのセット +} + diff --git a/build/tests/ExecPreLoadedApp/Makefile b/build/tests/ExecPreLoadedApp/Makefile new file mode 100644 index 00000000..9cf34e12 --- /dev/null +++ b/build/tests/ExecPreLoadedApp/Makefile @@ -0,0 +1,30 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: 2007-10-03#$ +# $Rev: 1319 $ +# $Author: kitase_hirotake $ +#---------------------------------------------------------------------------- + +include $(TWLSDK_ROOT)/build/buildtools/commondefs + +#---------------------------------------------------------------------------- + +SUBDIRS = banner ARM9 + +#---------------------------------------------------------------------------- + +include $(TWLSDK_ROOT)/build/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/tests/ExecPreLoadedApp/banner/Makefile b/build/tests/ExecPreLoadedApp/banner/Makefile new file mode 100644 index 00000000..ea261271 --- /dev/null +++ b/build/tests/ExecPreLoadedApp/banner/Makefile @@ -0,0 +1,49 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: 2007-10-03#$ +# $Rev: 1319 $ +# $Author: kitase_hirotake $ +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + +ICON_DIR = ./icon + +BANNER_ICON = $(ICON_DIR)/gameIcon.bmp +BANNER_SPEC = banner_v3.bsf + +TARGETS = banner.bnr +INSTALL_DIR = ./ +INSTALL_TARGETS = $(TARGETS) + +BANNER_ICON_NAME = $(basename $(BANNER_ICON)) + +LDIRT_CLEAN = $(TARGETS) \ + $(BANNER_ICON_NAME).nbfs \ + $(BANNER_ICON_NAME).nbfc \ + $(BANNER_ICON_NAME).nbfp \ + $(TARGETS:.bnr=.srl) + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + +#---------------------------------------------------------------------------- +# build +#---------------------------------------------------------------------------- +do-build: $(TARGETS) + +$(TARGETS): $(BANNER_SPEC) $(BANNER_ICON) + $(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \ + $(MAKEBANNER) -d -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS) + +# diff --git a/build/tests/ExecPreLoadedApp/banner/banner_v3.bsf b/build/tests/ExecPreLoadedApp/banner/banner_v3.bsf new file mode 100644 index 0000000000000000000000000000000000000000..1471d41d4a65ea4751b8410956ceb46e8e16dcca GIT binary patch literal 1092 zcmc(eze)o^5XQe!1>fNywK^hLq*KZHhbWRiHddEAB}bA=xFkj^A3$t;1mDC;e1KrD zm4cP6sK33-8{|+HW@lz+zWHW%_UF5#ZPn$=(@M5H>_7?YOex;F252FguUK95Wi6>R zi_UZYM&@-rHPnX55Ju-SMxJ^a;~C*=!O+tL?lJZVE5VL48Il=rGQ{g*n_&5LvaU^4 zRr%M>Tz4n%a_nOD;ai5`M#jmV9q1U(qCV`)o@^nxwtIWFce}GU`?Lpp#ow{X?X=dk zQ@gQ8doh<+(NUInNar2!tL$UY-Cek94Qf?%i5^lR%_925L}-z=c>O`f!B?#ioL#E9 zKIY}K5Az~$>a%;Dm(NZ?_q bDN&JDiR^L`=z@uKzbn8Oa^54(A?E16u~@GX literal 0 HcmV?d00001 diff --git a/build/tests/ExecPreLoadedApp/banner/icon/gameIcon.bmp b/build/tests/ExecPreLoadedApp/banner/icon/gameIcon.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3ee487c3b8152820d3303228b2e70f925661730e GIT binary patch literal 630 zcmY+Bu}{K46vm&%#8KH9EMYJq47P-=3+<*1#Jfoui1ro(VIXb7i~}M4VBdus6E9;KA(qD zsRY$(6)ekwMxz0(Rtvh_F7*3-7z_q591dYJnLrqZuvjc0j$_zvw*dA(!7-&2Pb|YQ z3aHbK%N$BZnP z>w6EST?@g1_wd>-iQAxt)bR6_v z8M3YGl_YA<#v>nRFo|6=Dk(A=JeQet$I4(*QnPHVhst0&v}W7sM?0EHgURSMGVesn zP-o6Hk*o}tj458npR?&mw78>K$5EFmLGk?OWtp|Ob4a@4o%e5<5P0{Dq%og=eMga; xp(l97*;@RMnDaNmXkaM3Ct|yTSDb&~2XaV~qLp(VWeMbDt&}A^ic8-U`~mU96Wss+ literal 0 HcmV?d00001 diff --git a/build/tests/Makefile b/build/tests/Makefile index 8002d17b..dbbf4f3f 100644 --- a/build/tests/Makefile +++ b/build/tests/Makefile @@ -20,7 +20,7 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBDIRS = RelocateChecker AppliCooperation +SUBDIRS = RelocateChecker AppliCooperation ExecPreLoadedApp #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/ARM7/Makefile.0 b/build/tests/RelocateChecker/ARM7/Makefile.0 index 5fbe712e..2efecdfe 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.0 +++ b/build/tests/RelocateChecker/ARM7/Makefile.0 @@ -40,9 +40,9 @@ LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR) CRT0_O = crt0_rc.LTD.TWL.o TARGET_FOB += ARM7FLX.fob -FBDSIZE_ARM7FLX = 50000 +FBDSIZE_ARM7FLX = 4 TARGET_FOB += ARM7LTD.fob -FBDSIZE_ARM7LTD = 540672 +FBDSIZE_ARM7LTD = 4 #---------------------------------------------------------------------------- include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs diff --git a/build/tests/RelocateChecker/ARM7/Makefile.2 b/build/tests/RelocateChecker/ARM7/Makefile.2 index 41d5b9e3..fc88fc33 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.2 +++ b/build/tests/RelocateChecker/ARM7/Makefile.2 @@ -40,9 +40,9 @@ LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR) CRT0_O = crt0_rc.LTD.TWL.o TARGET_FOB += ARM7FLX.fob -FBDSIZE_ARM7FLX = 50000 +FBDSIZE_ARM7FLX = 4 TARGET_FOB += ARM7LTD.fob -FBDSIZE_ARM7LTD = 540672 +FBDSIZE_ARM7LTD = 4 #---------------------------------------------------------------------------- include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs @@ -59,7 +59,7 @@ endif #MACRO_FLAGS += -DSDK_ARM7COMP_LTD MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000' \ - -DADDRESS_FLXMAIN='0x02370000' \ + -DADDRESS_FLXMAIN='0x0237fffc' \ -DADDRESS_BOOTCORE='0x0380f000' \ -DCRT0_O='$(CRT0_O)' diff --git a/build/tests/RelocateChecker/ARM7/Makefile.4 b/build/tests/RelocateChecker/ARM7/Makefile.4 index b6b800a0..f5a29453 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.4 +++ b/build/tests/RelocateChecker/ARM7/Makefile.4 @@ -42,7 +42,7 @@ CRT0_O = crt0_rc.LTD.TWL.o TARGET_FOB += ARM7FLX.fob FBDSIZE_ARM7FLX = 4 TARGET_FOB += ARM7LTD.fob -FBDSIZE_ARM7LTD = 540672 +FBDSIZE_ARM7LTD = 4 #---------------------------------------------------------------------------- include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs diff --git a/build/tests/RelocateChecker/ARM7/hyena_rc2.lcf.template b/build/tests/RelocateChecker/ARM7/hyena_rc2.lcf.template index 904593ec..029d2df8 100644 --- a/build/tests/RelocateChecker/ARM7/hyena_rc2.lcf.template +++ b/build/tests/RelocateChecker/ARM7/hyena_rc2.lcf.template @@ -566,7 +566,7 @@ SECTIONS SDK_LTDAUTOLOAD.LTDMAIN.BSS_END = SDK_LTDAUTOLOAD.LTDMAIN.START; SDK_LTDAUTOLOAD.LTDMAIN.SIZE = 0; SDK_LTDAUTOLOAD.LTDMAIN.BSS_SIZE = 0; - SDK_LTDAUTOLOAD_TOP_START = 0x02e70000; + SDK_LTDAUTOLOAD_TOP_START = 0x02e7fffc; SDK_LTDAUTOLOAD_TOP_SIZE = 4; # STATIC 領域が無い代わりに 4 bytes のダミーがバイナリファイルの先頭に入る # SDK_LTDAUTOLOAD_START = SDK_LTDAUTOLOAD_TOP_START + SDK_LTDAUTOLOAD_TOP_SIZE; SDK_LTDAUTOLOAD_SIZE = 0; diff --git a/build/tests/RelocateChecker/ARM9/Makefile.0 b/build/tests/RelocateChecker/ARM9/Makefile.0 index 602552cc..1ae632c3 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.0 +++ b/build/tests/RelocateChecker/ARM9/Makefile.0 @@ -29,10 +29,10 @@ MAKELCF_FLAGS += -DADDRESS_FLXMAIN='0x02000400' TARGET_FOB = ARM9FLX.fob #ARM9_FLX_addsize -FBDSIZE_ARM9FLX = 1310720 +FBDSIZE_ARM9FLX = 4 TARGET_FOB += ARM9LTD.fob #ARM9_LTD_addsize -FBDSIZE_ARM9LTD = 2097152 +FBDSIZE_ARM9LTD = 4 TARGET_NUMBER = 0 TARGET_NAME = RelocateChecker$(TARGET_NUMBER) diff --git a/build/tests/RelocateChecker/ARM9/Makefile.2 b/build/tests/RelocateChecker/ARM9/Makefile.2 index 8d0bfe37..9579246a 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.2 +++ b/build/tests/RelocateChecker/ARM9/Makefile.2 @@ -29,10 +29,10 @@ MAKELCF_FLAGS += -DADDRESS_FLXMAIN='0x02000400' TARGET_FOB = ARM9FLX.fob #ARM9_FLX_addsize -FBDSIZE_ARM9FLX = 1310720 +FBDSIZE_ARM9FLX = 4 TARGET_FOB += ARM9LTD.fob #ARM9_LTD_addsize -FBDSIZE_ARM9LTD = 2097152 +FBDSIZE_ARM9LTD = 4 TARGET_NUMBER = 2 TARGET_NAME = RelocateChecker$(TARGET_NUMBER) diff --git a/build/tests/RelocateChecker/ARM9/Makefile.4 b/build/tests/RelocateChecker/ARM9/Makefile.4 index 856d9e1b..a446d6ab 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.4 +++ b/build/tests/RelocateChecker/ARM9/Makefile.4 @@ -32,7 +32,7 @@ TARGET_FOB = ARM9FLX.fob FBDSIZE_ARM9FLX = 4 TARGET_FOB += ARM9LTD.fob #ARM9_LTD_addsize -FBDSIZE_ARM9LTD = 2097152 +FBDSIZE_ARM9LTD = 4 TARGET_NUMBER = 4 TARGET_NAME = RelocateChecker$(TARGET_NUMBER) diff --git a/build/tests/RelocateChecker/ARM9/rc2.lcf.template b/build/tests/RelocateChecker/ARM9/rc2.lcf.template index b745f901..35b45072 100644 --- a/build/tests/RelocateChecker/ARM9/rc2.lcf.template +++ b/build/tests/RelocateChecker/ARM9/rc2.lcf.template @@ -658,7 +658,7 @@ SECTIONS SDK_LTDAUTOLOAD.LTDMAIN.BSS_EDN = SDK_LTDAUTOLOAD.LTDMAIN.START; SDK_LTDAUTOLOAD.LTDMAIN.SIZE = 0; SDK_LTDAUTOLOAD.LTDMAIN.BSS_SIZE = 0; - SDK_LTDAUTOLOAD_TOP_START = 0x023ffff0; + SDK_LTDAUTOLOAD_TOP_START = 0x023ffffc; SDK_LTDAUTOLOAD_TOP_SIZE = 4; # STATIC 領域が無い代わりに 4 bytes のダミーがバイナリファイルの先頭に入る # SDK_LTDAUTOLOAD_START = SDK_LTDAUTOLOAD_TOP_START + SDK_LTDAUTOLOAD_TOP_SIZE; SDK_LTDAUTOLOAD_SIZE = 0;