From 7b9a34d1a69676a05ceb19cac7d6a53e9c06c353 Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Mon, 5 Nov 2007 06:50:21 +0000 Subject: [PATCH] =?UTF-8?q?NAM=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=A6TitleID?= =?UTF-8?q?=E3=82=92Nand=E3=81=8B=E3=82=89=E5=8F=96=E5=BE=97=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=EF=BC=88?= =?UTF-8?q?=E3=83=90=E3=83=8A=E3=83=BC=E3=81=AF=E6=9C=AA=E8=AA=AD=E3=81=AA?= =?UTF-8?q?=E3=81=AE=E3=81=A7NoBanner=E8=A1=A8=E7=A4=BA=EF=BC=89=20?= =?UTF-8?q?=E3=83=90=E3=83=8A=E3=83=BC=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=20=E9=81=B8=E6=8A=9E=E4=B8=AD=E3=83=90=E3=83=8A=E3=83=BC?= =?UTF-8?q?=E3=81=B8=E3=81=AE=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF=E3=83=88?= =?UTF-8?q?=E5=AE=9F=E9=A8=93=E4=B8=AD=EF=BC=88=E7=8F=BE=E5=9C=A8=E3=81=AF?= =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=82=BF=E3=81=AE=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E3=81=8C=E3=81=86=E3=81=BE=E3=81=8F=E3=81=84=E3=81=8B=E3=81=9A?= =?UTF-8?q?=E4=B8=8D=E8=87=AA=E7=84=B6=E3=81=AA=E8=A1=A8=E7=A4=BA=EF=BC=89?= 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@100 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/sysmenu/ARM9/Makefile | 1 - .../sysmenu/ARM9/src/sysmenu_lib.c | 39 ++++++++++-- build/systemMenu_RED/Launcher/ARM9/Makefile | 3 + build/systemMenu_RED/Launcher/ARM9/main.rsf | 2 +- .../Launcher/ARM9/src/launcher.c | 60 ++++++++++-------- .../Launcher/ARM9/src/launcher.h | 1 + build/systemMenu_RED/Launcher/ARM9/src/main.c | 4 +- build/systemMenu_RED/data/EmptyBanner.bnr | Bin 2624 -> 2624 bytes .../{PictoChatBanner.bnr => NoBanner.bnr} | Bin 2624 -> 2624 bytes build/systemMenu_RED/data/SettingBanner.bnr | Bin 2624 -> 0 bytes .../sysmenu/sysmenu_lib/ARM9/sysmenu_api.h | 2 +- 11 files changed, 78 insertions(+), 34 deletions(-) rename build/systemMenu_RED/data/{PictoChatBanner.bnr => NoBanner.bnr} (58%) delete mode 100644 build/systemMenu_RED/data/SettingBanner.bnr diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile index 41d35031..4a3123e1 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile +++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile @@ -31,7 +31,6 @@ SRCS = sysmenu_lib.c sysmenu_card.c sysmenu_util.c gameBoot.c ninLogoFunc.c cm TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a - include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index 8b40ee0e..191160ad 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -16,6 +16,7 @@ *---------------------------------------------------------------------------*/ #include +#include #include #include "sysmenu_define.h" #include "sysmenu_card.h" @@ -27,6 +28,8 @@ #define SCREEN_RED 0 #define SCREEN_YELLOW 1 +#define TITLE_ID_BUF_SIZE 40 + typedef struct BannerCheckParam { u8 *srcp; u32 size; @@ -115,6 +118,16 @@ static inline void DBG_SetRed(u32 y_pos) // function's description // ============================================================================ +static void * AllocForNAM(unsigned long size) +{ + return OS_AllocFromHeap( OS_ARENA_MAIN, OS_CURRENT_HEAP_HANDLE, size ); +} + +static void FreeForNAM(void *p) +{ + OS_FreeToHeap( OS_ARENA_MAIN, OS_CURRENT_HEAP_HANDLE, p); +} + // SystemMenuの初期化 void SYSM_Init( void ) { @@ -135,6 +148,9 @@ void SYSM_Init( void ) // ※ISデバッガかどうかの判定。　BootROMからのパラメータ引渡し？ SYSMi_WaitInitARM7(); + + //NAMの初期化 + NAM_Init(AllocForNAM,FreeForNAM); } @@ -183,12 +199,27 @@ int SYSM_GetCardTitleList( TitleProperty *pTitleList_Card ) } -int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand ) +int SYSM_GetNandTitleList( TitleProperty *pTitleList_Nand, int size) { -#pragma unused( pTitleList_Nand ) // filter_flag : ALL, ALL_APP, SYS_APP, USER_APP, Data only, 等の条件を指定してタイトルリストを取得する。 - // return : *TitleProperty Array - return 0; + int l; + int gotten; + NAMTitleId titleIdArray[TITLE_ID_BUF_SIZE]; + gotten = NAM_GetTitleList(titleIdArray, TITLE_ID_BUF_SIZE); + for(l=0;l 0 ); + size = CMN_LoadFile( (void **)&nobanner_banner, "data/NoBanner.bnr", &g_allocator); + NNS_G2D_ASSERT( size > 0 ); size = CMN_LoadFile( (void **)&card_banner, "data/CardBanner.bnr", &g_allocator); NNS_G2D_ASSERT( size > 0 ); - size = CMN_LoadFile( (void **)&pictochat_banner, "data/PictochatBanner.bnr", &g_allocator); - NNS_G2D_ASSERT( size > 0 ); size = CMN_LoadFile( (void **)&download_banner, "data/DownloadBanner.bnr", &g_allocator); NNS_G2D_ASSERT( size > 0 ); - size = CMN_LoadFile( (void **)&setting_banner, "data/SettingBanner.bnr", &g_allocator); - NNS_G2D_ASSERT( size > 0 ); } // パレットの読み込みやOBJ関係の初期化 @@ -167,8 +162,9 @@ static void BannerInit() 0, // charactor 0, // palette 0); // affine - DC_FlushRange(&banner_oam_attr[l], sizeof(banner_oam_attr[l])); } + G2_SetOBJEffect(&banner_oam_attr[2], GX_OAM_EFFECT_AFFINE_DOUBLE, 0); + DC_FlushRange(&banner_oam_attr, sizeof(banner_oam_attr)); } // 活線挿抜対応のため、毎回VRAMへのイメージデータロード判定をしている @@ -177,18 +173,18 @@ static void BannerDraw(int cursor, int selected, TitleProperty *titleprop) static int count = 0; int l; - // TitleProperty……本来は外部から取得 + // TitleProperty弄り for(l=0;lv1.gameName[GetNCDWork()->option.language]; @@ -279,8 +291,6 @@ void LauncherInit( TitleProperty *pTitleList ) // ランチャーメイン TitleProperty *LauncherMain( TitleProperty *pTitleList ) { -#pragma unused( pTitleList ) - static BOOL touch_bl = FALSE; BOOL tp_bl_on_off = FALSE; BOOL tp_select = FALSE; @@ -336,7 +346,7 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList ) // DrawMenu( s_csr, &s_launcherParam ); #ifdef DBGBNR - BannerDraw( s_csr, selected, NULL ); + BannerDraw( s_csr, selected, pTitleList ); #endif if( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) { // メニュー項目への分岐 diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.h b/build/systemMenu_RED/Launcher/ARM9/src/launcher.h index fd63c322..a2120e2f 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.h +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.h @@ -26,6 +26,7 @@ extern "C" { #endif // define data---------------------------------------------------------- +#define TITLE_PROPERTY_NUM 40 // global variables-------------------------------------------------- diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index 6d7dc103..b32dd269 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -59,7 +59,7 @@ void TwlMain( void ) }; u32 state = START; TitleProperty *pBootTitle = NULL; - TitleProperty *pTitleList = NULL; + TitleProperty pTitleList[TITLE_PROPERTY_NUM]; OS_Init(); @@ -98,7 +98,7 @@ void TwlMain( void ) // FS_ReadSharedContentFile( ContentID ); // NANDアプリリストの取得---------- - (void)SYSM_GetNandTitleList( pTitleList ); + (void)SYSM_GetNandTitleList( pTitleList, TITLE_PROPERTY_NUM ); while( 1 ) { OS_WaitIrq(1, OS_IE_V_BLANK); // Vブランク割り込み待ち diff --git a/build/systemMenu_RED/data/EmptyBanner.bnr b/build/systemMenu_RED/data/EmptyBanner.bnr index 35bb2e40d4f126bf3a919da6fbc8240e7b9c4bd7..9a4757f36f1f958fe2b34133439066e81f894882 100644 GIT binary patch literal 2624 zcmZQ(ShlKbPtiFB@&FsUwgk4c1dw0=6r;Ng>+>V#5K*8>|coY-|h(2?+r(3={-;-2sTf zAe6y{nSsTD0fb!`449$9aEeKQfdPgU1cAapz5s|u0W3fs2s?lXoWR(CSqY~kP(p!8 z5NJ9Y0Es|F88Pey%GD(EEEPE>!J+7-*<*Ol^1ZEqQ;^q`pzm>(>DBrF>#M5J%o|}` z4F*>RKL$-8nafbXP{L3-;{5N%5HzCw?+%RnksSY?3?U=h|G~fleOZMIe#OssHvi87-NfR`!difTa_$->XFOkW=BBLY9dp*Gq`{Fl^1n_Y zMty3J(EA9zZ($z^rBq-;QHFu2Wfe`3&0!451~6Milrcf3X&MH|D8ksXEORPPYs?x( z#rO|+_y%M`-aWtdsqpR2%)-X`+D+zXXm;PCm;8h2qQJJ vjJZp;$Q!bqkJ$fGE|Ds!=Q{s7&OXoQ|ByV*b^a&hajx?_IsgAX$aVg|aiky4 diff --git a/build/systemMenu_RED/data/PictoChatBanner.bnr b/build/systemMenu_RED/data/NoBanner.bnr similarity index 58% rename from build/systemMenu_RED/data/PictoChatBanner.bnr rename to build/systemMenu_RED/data/NoBanner.bnr index 87072f9aa865cb681d87eee8b1656ef8b1351031..6d640e836a32c8382094bd3ca9cadcf1e8c054c9 100644 GIT binary patch literal 2624 zcmd^?LNOm^{kiv6?#DMw_)Mx$t+4t=C^!ZLc$tDk99lU?T zjvCYH^dOGoWIu|MC>jEtL_?sP$xu%qPa(%z>p<)6peZrp{b+qB2-bE2mFjpk3If#& zl=3AJ;a01j?9z!3?YWP9)&0^6p13;P`aI#q_FIYR++d=SrFU> zw7@wPITytePcz0T{jfJyp%1!;_yce34_4vt!oP!<(EI1_B8I5t(rf9`(h7;PP29B| zc$*~>=0)N~LvY*RMNFm?3XWYc9eWn!Os9~`Ir*GX8FvRX@@jy>(PphQYD+n4NcS~ zIXjbIo_~8`cQLtix>8+!SN*xZ*m%A%efin?V12cISih|A);H_7m49;6I%+E&$N4!X z*mX7!HrP2d8QBMy0 ziXSSK?Em%eE1*ivGSy30l}uMLMo2V{BN1W)N{=DSrqB$hK@+AtTnQMga5`t1(E#Dg zl=3>ItnSe=V_ecd>y6c!MB+Je5RK)a+mk8!r>|s`HluC|k?`EE_>qYaxPX9%m;vnx zv-yMuh;2_id|e)=p3A7~(7Nl-aU9=uY~Q_s)NJ3W)qJ~VwZ`#4jH2Tb7Y@QQkE1b49)d^Az;SH0ZCe&L%Ryt;b?s6vGisLAvi<>YzJf9# zZ+EVJym@kK;r7t?{KXZG6Rk*(Umb#}^4B z56BXENM4W~@|x@tpFAhe@T?lONY+Wa((~WI9Z==<-z1MKJ^x4e?N@pI{fhtp?p1pJ Fe*mGdGSdJ6 diff --git a/build/systemMenu_RED/data/SettingBanner.bnr b/build/systemMenu_RED/data/SettingBanner.bnr deleted file mode 100644 index e1f6218ecb8c07862ee762358d8f853af61e5582..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2624 zcmd^W)7@vkPtQL2I@^BJXX_u?RaKVd zpFGct(=02pYzTCb4T0_!Lwydrgq>@xmDc;J8=~^lZ0%5~XNO8wJ|4}KlBtq1355_? zY8l6$-VyD=W|`JA$xh67H)75y;`(vOV;?MrywKgFLWiQz=Q&VQ_D@uyPI^GD9`vL* zkZJbwqJK}O31WPiZUzwH3$Yc5vp5i2esC63Fz`tTBEbRCB${90d-H-O6%Y6&MEwR) ztKm|WF|Ozxr(=1XfK9M8P6h$!AVwfYKsbaT6G$J@;Zw=`7pv(ebp*M{b|DTY$EJqk zO|fmyu`SQJ1x(AcP1CbXqdDFk{21;0ia|KqAa@jp;V24M*6|)0p(Y*CLfUsUcF+LX zReuMLTiJ-Q5o19t%Q6gzVWY9*I96p>8Kz-0jsL*S*I+aD;rWekw}0Q6x!aoia{p+d zczCnfZhdY4U0aCWzb?1$eNI=eIy!aOpJkjqVRLMmy