バナー、bsfファイルを更新

カードアプリにもバナーを付加
Launcher TitleID LoをSecure User InfoからSecure HW Infoへ移動


git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2228 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/tests/DisplaySystemInformation/ARM9/Makefile

@@ -31,10 +31,9 @@ include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs
 #----------------------------------------------------------------------------
 
 rb:
-	ruby makeMakingTest.rb
+	ruby makeMaking.rb
 
 do-build :
-	
 	$(TARGETS)
 
 

build/tests/DisplaySystemInformation/ARM9/makeMaking.rb

@@ -34,11 +34,9 @@ while l = fCond.gets
 		strVal = "DONTCARE" if value == "D"
 
 		if argList[argIdx] == "GAMECODE" || argList[argIdx] == "FILE_IDX"
-			argSet = argList[argIdx] + "\t=\t"
-			argSet += value
+			argSet = "#{argList[argIdx]}\t=\t#{value}"
 		else
-			argSet = argList[argIdx].to_s + "\t=\t"
-			argSet += strVal
+			argSet = "#{argList[argIdx]}\t=\t#{strVal}"
 		end
 
 		f.puts argSet
@@ -52,3 +50,5 @@ while l = fCond.gets
 end
 
 fCond.close
+
+(0...fileIdx).each{ |i| print "Makefile.#{i} "}

build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c

@@ -236,7 +236,7 @@ void printValue( int menu,int entryLine, int drawOffset, DispInfoEntry *entry )
 		return;
 	}
 	
-	if( menu == MENU_SECURE_USER && entryLine == SECURE_USER_LAUNCHER_ID )
+	if( menu == MENU_SECURE_HW && entryLine == SECURE_HW_LAUNCHER_ID )
 	{
 		char buf[5];
 		

build/tests/DisplaySystemInformation/ARM9/src/get_hw.c

@@ -82,6 +82,25 @@ void getSecureHWInfo( void )
 
 	}
 	
+	// ランチャのタイトルIDLoの取得
+	if( LCFG_ReadHWSecureInfo() )
+	{
+		const u8 *titleIDLo = LCFG_THW_GetLauncherTitleID_LoPtr();
+		value = ( int )(	titleIDLo[0] << 8*3 |
+							titleIDLo[1] << 8*2 |
+							titleIDLo[2] << 8*1 |
+							titleIDLo[3] << 8*0 );
 
+		gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].iValue = value;
+		gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].isNumData = TRUE;
+	}
+	else
+	{
+		gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].str.sjis = s_strNA;
+	}
+	
+	gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].isAligned = FALSE;
+	gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].numLines = 2;
+	gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].fromLCFG = TRUE;
 
 }

build/tests/DisplaySystemInformation/ARM9/src/get_secureUser.c

@@ -108,24 +108,5 @@ void getSecureUserInfo( void )
 		}
 	}
 	
-	// ランチャのタイトルIDLoの取得
-	if( LCFG_ReadHWSecureInfo() )
-	{
-		const u8 *titleIDLo = LCFG_THW_GetLauncherTitleID_LoPtr();
-		value = ( int )(	titleIDLo[0] << 8*3 |
-							titleIDLo[1] << 8*2 |
-							titleIDLo[2] << 8*1 |
-							titleIDLo[3] << 8*0 );
 
-		gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].iValue = value;
-		gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].isNumData = TRUE;
-	}
-	else
-	{
-		gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].str.sjis = s_strNA;
-	}
-	
-	gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].isAligned = FALSE;
-	gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].numLines = 2;
-	gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].fromLCFG = TRUE;
 }

build/tests/DisplaySystemInformation/ARM9/src/strResource.c

@@ -106,13 +106,12 @@ const char *s_strParentalMenu[] = {
 const char *s_strSecureUserMenu[] = {
 	"Finished Initial Setting(Setting)",
 	"Finished Initial Setting(Launcher)",
-	"Broken Setting Flag",
+	"Finished Broken Setting Sequence",
 	"Installed Softbox Count",
 	"Free Softbox Count",
 	"Last Boot Soft Index",
 	"Last Boot Soft Platform",
-	"Last Boot Soft ID",
-	"Launcher TitleID Lo"
+	"Last Boot Soft ID"
 };
 
 const char *s_strOtherMenu[] = {
@@ -131,7 +130,8 @@ const char *s_strSecureHWMenu[] = {
 	"Region",
 	"Serial No",
 	"Language Bitmap",
-	"Fuse Data"
+	"Fuse Data",
+	"Launcher TitleID Lo"
 };
 
 const char *s_strSCFGArm9Menu[] = {

build/tests/DisplaySystemInformation/ARM9/src/strResource.h

@@ -66,7 +66,6 @@
 #define SECURE_USER_LASTBOOT_IDX		5
 #define SECURE_USER_LASTBOOT_PLATFORM	6
 #define SECURE_USER_LASTBOOT_ID			7
-#define SECURE_USER_LAUNCHER_ID			8
 
 #define OTHER_AGREE_EULA				0
 #define OTHER_EULA_VERSION				1
@@ -80,6 +79,7 @@
 #define SECURE_HW_SERIAL		2
 #define SECURE_HW_LANGUAGE		3
 #define SECURE_HW_FUSE			4
+#define SECURE_HW_LAUNCHER_ID	5
 
 #define SCFG_ARM9_ROM_SEC			0
 #define SCFG_ARM9_ROM_STATE			1
@@ -186,10 +186,10 @@
 #define ROOTMENU_SIZE 			15
 #define OWNERMENU_SIZE 			6
 #define PARENTALMENU_SIZE 		12
-#define SECURE_USER_MENU_SIZE	9
+#define SECURE_USER_MENU_SIZE	8
 #define OTHERMENU_SIZE			3
 #define NORMAL_HW_MENU_SIZE 	2
-#define SECURE_HW_MENU_SIZE 	5
+#define SECURE_HW_MENU_SIZE 	6
 #define SCFG_ARM7_MENU_SIZE 	47
 #define SCFG_ARM9_MENU_SIZE 	24
 #define SYSMENU_MENU_SIZE		10

build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c

@@ -120,7 +120,7 @@ void initInfo( void )
 	// sjis (char)
 	infoAlloc( gAllInfo[MENU_OWNER], OWNER_BIRTHDAY, DISPINFO_BUFSIZE , TRUE );
 	infoAlloc( gAllInfo[MENU_SECURE_USER], SECURE_USER_LASTBOOT_ID, DISPINFO_BUFSIZE , TRUE );
-	infoAlloc( gAllInfo[MENU_SECURE_USER], SECURE_USER_LAUNCHER_ID, DISPINFO_BUFSIZE, TRUE );
+	infoAlloc( gAllInfo[MENU_SECURE_HW], SECURE_HW_LAUNCHER_ID, DISPINFO_BUFSIZE, TRUE );
 	infoAlloc( gAllInfo[MENU_NORMAL_HW], NORMAL_HW_UNIQUE_ID, OS_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN*3 , TRUE );
 	infoAlloc( gAllInfo[MENU_SECURE_HW], SECURE_HW_SERIAL , OS_TWL_HWINFO_SERIALNO_LEN_MAX + 1, TRUE );
 	infoAlloc( gAllInfo[MENU_SECURE_HW], SECURE_HW_LANGUAGE, DISPINFO_BUFSIZE , TRUE );

build/tests/DisplaySystemInformation/banner/Makefile

@@ -16,21 +16,24 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-SUBDIRS					=	
-SUBMAKES		=	Makefile.020A Makefile.021A Makefile.022A Makefile.023A \
-					Makefile.024A Makefile.025A Makefile.0B0A Makefile.0B1A \
-					Makefile.0B2A Makefile.0B3A Makefile.0B4A Makefile.0B5A \
-					Makefile.0B6A Makefile.0B7A Makefile.0B8A Makefile.0B9A \
-					Makefile.0BAA Makefile.0BBA
-include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs
+SUBDIRS			=	
+SUBMAKES		=	\
+	Makefile.0B0A	Makefile.0B1A	Makefile.0B2A	Makefile.0B3A	\
+	Makefile.020A	Makefile.021A	Makefile.0B4A	Makefile.0B5A	\
+	Makefile.0B6A	Makefile.0B7A	Makefile.0B8A	Makefile.0B9A	\
+	Makefile.0BAA	Makefile.0BBA	Makefile.022A	Makefile.023A	\
+	Makefile.024A	Makefile.025A	
+
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
 do-build : $(TARGETS)
 
-include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 
 #----------------------------------------------------------------------------
 
 #===== End of Makefile =====
-

build/tests/DisplaySystemInformation/banner/Makefile.020A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.021A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.022A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.023A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.024A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.025A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B0A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B1A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B2A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B3A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B4A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B5A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B6A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B7A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B8A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0B9A

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0BAA

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/Makefile.0BBA

@@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 ICON_DIR			= ./icon
 
 BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
 
 TARGETS				= $(GAMECODE).bnr
 INSTALL_DIR			= ./

build/tests/DisplaySystemInformation/banner/bannerOption.txt

@@ -0,0 +1,19 @@
+#gamecode	bannerStr
+0B0A	DisplayInfo_0
+0B1A	DisplayInfo_1
+0B2A	DisplayInfo_2
+0B3A	DisplayInfo_3
+020A	DisplayInfo_4
+021A	DisplayInfo_5
+0B4A	DisplayInfo_6
+0B5A	DisplayInfo_7
+0B6A	DisplayInfo_8
+0B7A	DisplayInfo_9
+0B8A	DisplayInfo_10
+0B9A	DisplayInfo_11
+0BAA	DisplayInfo_12
+0BBA	DisplayInfo_13
+022A	DisplayInfo_14
+023A	DisplayInfo_15
+024A	DisplayInfo_16
+025A	DisplayInfo_17