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

ユーザカラーの項目が色化けしていたバグを修正。

Browse Source 
フォント変更によるハッシュ値の更新。
SystemMenu Versionの仕様変更に伴うハッシュ値の更新。
項目にWhiteListを追加。
InstalledContentVersionの表記を"(major).(minor)"に変更


git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2120 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
aoki_ryoma 2008-08-07 01:25:18 +00:00
parent d7e3961a3a
commit 120336a1c2
31 changed files with 273 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/tests/DisplaySystemInformation/ARM9/Makefile
View File

@ -24,11 +24,19 @@ SUBMAKES = Makefile.0 Makefile.1 Makefile.2 Makefile.3\
Makefile.16 Makefile.17
#SUBMAKES = Makefile.0
include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs
#----------------------------------------------------------------------------
do-build : $(TARGETS)
rb:
ruby makeMakingTest.rb
do-build :
$(TARGETS)
include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules

6
build/tests/DisplaySystemInformation/ARM9/Makefile.0
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.1
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.10
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.11
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.12
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.13
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.14
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.15
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.16
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.17
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.2
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.3
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.4
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.5
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.6
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.7
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.8
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

6
build/tests/DisplaySystemInformation/ARM9/Makefile.9
View File

@ -41,11 +41,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -78,6 +79,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

4
build/tests/DisplaySystemInformation/ARM9/filemove.rb
View File

@ -9,11 +9,11 @@ dirList = Dir::entries "."
for dir in dirList
puts dir
puts "===== #{dir} ====="
Dir::chdir "./#{dir}"
Dir::glob("./*.{tad,srl}").each {|f|
puts #{f}
puts "cp #{f} #{dstDir}/"
`cp #{f} #{dstDir}/`
}

2
build/tests/DisplaySystemInformation/ARM9/main_normal.rsf
View File

@ -179,7 +179,7 @@ Property
LockSCFG $(DISPINFO_LOCKSCFG)
# AESSlotフラグはノーマルアプリでは利用できない
# HwAESSlotA_SSLClientCert TRUE
HwAESSlotA_SSLClientCert FALSE
###
#### END

6
build/tests/DisplaySystemInformation/ARM9/makeFooter.txt
View File

@ -13,11 +13,12 @@ SRCS = main.c viewSystemInfo.c drawFunc.c control.c\
strResource.c misc.c util.c\
get_versionData.c get_sysmenu.c get_scfg.c get_owner.c\
get_hw.c get_parental.c get_other.c\
get_secureUser.c get_font.c get_wl.c\
get_secureUser.c get_font.c get_wl.c get_whitelist.c\
$(MISC_DIR)/src/cmn.c
LINCLUDES += $(MISC_DIR)/include \
$(DISP_INFO)/common/include
$(DISP_INFO)/common/include \
$(ES_ROOT)/twl/include
TARGET_BIN = DispInfo_$(FILE_IDX).$(FILE_SUFFIX)
@ -50,6 +51,7 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS)
#=============================================================================
include $(TWLSDK_ROOT)/add-ins/es/commondefs.es
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

1
build/tests/DisplaySystemInformation/ARM9/src/control.c
View File

@ -266,6 +266,7 @@ BOOL control( int *menu, int *line, int *changeLine, u8 *mode )
case MENU_SYSMENU:
case MENU_FONT:
case MENU_WL:
case MENU_WHITE:
case MENU_VERSION:
// 今の画面の選択位置を記録
selectLine[ROOTMENU_SIZE] = *line;

9
build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c
View File

@ -204,7 +204,7 @@ void printValue( int menu,int entryLine, int drawOffset, DispInfoEntry *entry )
if( menu == MENU_OWNER && entryLine == OWNER_COLOR )
{
PrintfSJIS( VALUE_LEFT , VALUE_UP + LINE_OFFSET*drawOffset, TXT_UCOLOR_G0 + entry->iValue , "<EFBFBD>¡" );
PrintfSJIS( VALUE_LEFT , VALUE_UP + LINE_OFFSET*drawOffset, TXT_UCOLOR_GRAY + entry->iValue , "<EFBFBD>¡" );
printData( VALUE_LEFT + LINE_OFFSET , VALUE_UP + LINE_OFFSET*drawOffset, txtColor, entry );
return;
}
@ -548,7 +548,8 @@ void drawExecuteMode( const char *command, int changeLine, u8 mode )
void drawVersion( int idx, int drawLine ,int selected )
{
int kindColor = TXT_COLOR_BLACK;
u16 value = gContentsVersion[idx];
if( idx == selected)
{
// 選択項目はいろかえる
@ -574,8 +575,8 @@ void drawVersion( int idx, int drawLine ,int selected )
PrintfSJIS( KIND_LEFT, KIND_UP + LINE_OFFSET*drawLine , kindColor, "%s", buf );
}
// ’l
PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET*drawLine , TXT_COLOR_BLACK, "%x", gContentsVersion[idx] );
// ’l
PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET*drawLine , TXT_COLOR_BLACK, "%x.%x", value >> 8, value & 0xFF );
}
void drawFontInfo( int idx, int drawLine, int selected )

1
build/tests/DisplaySystemInformation/ARM9/src/getInformation.h
View File

@ -42,6 +42,7 @@ void getOtherInfo( void );
void getSecureUserInfo( void );
void getFontInfo( void );
void getWLInfo( void );
void getWhiteListInfo( void );
void getContentsVersion( void );
#endif

2
build/tests/DisplaySystemInformation/ARM9/src/get_font.c
View File

@ -12,7 +12,7 @@
const static char* s_strFontHash[] = {
"07381F6C1FF7421BA309196FA9FC750706B031AD",
"EF271DAD8B67EDB3DDE2655C6C35288D1334132D",
"803410DCAF5647134C9B68DA9ADEB562D212DCFC"
"28e68d0496ab28d7f082b70fc8f4f9081dee2ccc"
};
FontInfo gFontInfo[ OS_SHARED_FONT_MAX ];

13
build/tests/DisplaySystemInformation/ARM9/src/get_sysmenu.c
View File

@ -20,10 +20,8 @@
#define FILE_SIGN_NUP_PRV "verdata:/.twl-nup-prvkey.der"
#define FILE_SIGN_SHOP_CERT "verdata:/.twl-shop-cert.der"
#define FILE_SIGN_SHOP_PRV "verdata:/.twl-shop-prvkey.der"
#define FILE_SIGN_NINTENDO_CA "verdata:/NintendoCA.der"
#define FILE_SIGN_NINTENDO_CAC2 "verdata:/NintendoCA-C2.der"
#define FILE_SIGN_NINTENDO_CAG2 "verdata:/NintendoCA-G2.der"
#define NUM_FILE_SIGN 7
#define NUM_FILE_SIGN 5
typedef struct SystemMenuVersion {
@ -37,8 +35,6 @@ static char* s_strSignFilePath[] = {
FILE_SIGN_NUP_PRV,
FILE_SIGN_SHOP_CERT,
FILE_SIGN_SHOP_PRV,
FILE_SIGN_NINTENDO_CA,
FILE_SIGN_NINTENDO_CAC2,
FILE_SIGN_NINTENDO_CAG2,
};
@ -47,9 +43,7 @@ static char* s_strSignHash[] = {
"7497940e3a3591d592b46ff99d75ebe102c27550",
"cf130c7674bae733f3b106109bb06cc0d6ac1a18",
"ab38a52a384ab63ea8397de6eae8a96d6c108888",
"b5229455dd26c1f53c73060e9089b391389e1f75",
"aa8ef66ae0f807edb841c889ee3666a259a28ccc",
"c60b2a5cc90f0630cca33040df6b3378239f3bfa"
"c60b2a5cc90f0630cca33040df6b3378239f3bfa"
};
@ -160,6 +154,7 @@ void getSysmenuInfo( void )
if( !FS_OpenFileEx( &file[i], s_strSignFilePath[i], FS_FILEMODE_R ) )
{
// 開けなかったらNANDアクセス禁止状態なので戻る
OS_Printf("sysmenu info error: Openfile failed.\n" );
return ;
}
@ -191,7 +186,7 @@ void getSysmenuInfo( void )
FS_ReadFile( &file[i], srcBuf, (s32)fileLen[i] );
OS_TPrintf("FileSize: %d byte HeadData: %02x%02x%02x\n", fileLen[i], srcBuf[0], srcBuf[1], srcBuf[2] );
if( SYSMENU_NUP_CERT <= idx && idx < SYSMENU_NINTENDO_CA )
if( SYSMENU_NUP_CERT <= idx && idx < SYSMENU_NINTENDO_CAG2 )
{
s32 result;

151
build/tests/DisplaySystemInformation/ARM9/src/get_whitelist.c Normal file
View File

@ -0,0 +1,151 @@
/*---------------------------------------------------------------------------*
Project: TwlIPL - tests - DisplaySystemInformation
File: get_whitelist.c
Copyright **** 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:: $
$Rev$
$Author$
*---------------------------------------------------------------------------*/
#include <twl.h>
#include <twl/nam.h>
#include <sysmenu/dht/dht.h>
#include <es.h>
#include <estypes.h>
#include "viewSystemInfo.h"
#include "strResource.h"
#include "getInformation.h"
#include "util.h"
#include "misc.h"
#define WHITELIST_TITLEID 0x0003000f484e4841
#define DS_HASH_TABLE_SIZE (256*1024)
void getWhitelistHash( void );
void getNumDHTEntry( void );
BOOL cmpHash( void *src1, void *src2 );
void getWhiteListInfo( void )
{
OS_TPrintf("...Whitelist Information\n");
getWhitelistHash();
getNumDHTEntry();
}
void getWhitelistHash( void )
{
u32 tmdSize, fileSize;
ESTitleMeta *tmd;
FSFile file;
char filePath[NAM_PATH_LEN+1];
u8 *fileBuf, digestBuf[MATH_SHA1_DIGEST_SIZE];
// ESライブラリを使ってハッシュ値を取得する
// 一回目の呼び出しでサイズを取得して二回目で値をもらう
ES_GetTmd( WHITELIST_TITLEID, NULL, &tmdSize );
tmd = (ESTitleMeta*) Alloc ( tmdSize );
SDK_ASSERT( tmd );
ES_GetTmd( WHITELIST_TITLEID , tmd, &tmdSize );
if( tmd == NULL )
{
OS_TPrintf("getting tmd hash failed.\n" );
return;
}
putBinary( (u8*)&tmd->contents[0].hash , MATH_SHA1_DIGEST_SIZE );
// ホワイトリストのファイルの実態を引っ張ってくる
FS_InitFile( &file );
NAM_GetTitleBootContentPath( filePath , WHITELIST_TITLEID );
OS_TPrintf("filepath : %s\n", filePath );
if( ! FS_OpenFileEx( &file, filePath, FS_FILEMODE_R ) )
{
OS_TPrintf("whitelist info error: FS_OpenFileEx() failed. FSResult: %d\n", FS_GetArchiveResultCode(filePath) );
return;
}
fileSize = FS_GetFileLength( &file );
fileBuf = (u8*) Alloc ( fileSize );
SDK_ASSERT( fileBuf );
if( fileSize != FS_ReadFile( &file, fileBuf, (s32)fileSize ) )
{
OS_TPrintf("whitelist info error: FS_ReadFileEx() failed. FSResult: %d\n", FS_GetArchiveResultCode(filePath) );
return;
}
MATH_CalcSHA1( digestBuf, fileBuf, fileSize );
putBinary( digestBuf, MATH_SHA1_DIGEST_SIZE );
gAllInfo[MENU_WHITE][WHITE_HASH].str.sjis = s_strCorrect [ cmpHash( digestBuf, &tmd->contents[0].hash ) ];
Free( tmd );
Free( fileBuf );
}
void getNumDHTEntry( void )
{
DHTFile *dht;
FSFile file;
char filePath[NAM_PATH_LEN+1];
dht = (DHTFile*) Alloc (DS_HASH_TABLE_SIZE);
FS_InitFile( &file );
NAM_GetTitleBootContentPathFast( filePath , WHITELIST_TITLEID );
OS_TPrintf("DHTEntry reading...\n");
if( ! FS_OpenFileEx( &file, filePath, FS_FILEMODE_R ) )
{
OS_TPrintf("whitelist info error: FS_OpenFileEx() failed. FSResult: %d\n", FS_GetArchiveResultCode(filePath) );
return;
}
/* if( ! FS_SeekFile( &file, sizeof(ROM_Header), FS_SEEK_SET ) )
{
OS_TPrintf("whitelist info error: FS_SeekFile() failed. FSResult: %d\n", FS_GetArchiveResultCode(filePath) );
return;
}
*/
if( ! DHT_PrepareDatabase( dht, &file ) )
{
OS_TPrintf("whitelist info error: PrepareDatabase() failed.\n" );
return;
}
DC_FlushRange( dht, DHT_GetDatabaseLength( dht ));
OS_TPrintf(" dht.header.nums : %d\n", dht->header.nums);
gAllInfo[MENU_WHITE][WHITE_NUM].iValue = (int)dht->header.nums;
gAllInfo[MENU_WHITE][WHITE_NUM].isNumData = TRUE;
Free(dht);
}
// 二つのハッシュを比較して一致してたら返す
// でもsrc2はビッグエンディアンやねん
BOOL cmpHash( void *src1, void *src2 )
{
u8 *u1 = (u8*)src1;
u8 *u2 = (u8*)src2;
return MI_CpuComp8( u1, u2, MATH_SHA1_DIGEST_SIZE ) == 0 ;
}

10
build/tests/DisplaySystemInformation/ARM9/src/strResource.c
View File

@ -31,6 +31,7 @@ int s_numMenu[] = {
SYSMENU_MENU_SIZE,
FONTMENU_SIZE,
WLMENU_SIZE,
WHITEMENU_SIZE,
VERSIONMENU_SIZE,
0,
0,
@ -72,6 +73,7 @@ const char *s_strRootMenu[] = {
"<EFBFBD>ƒSystemMenu Version<6F>„",
"<EFBFBD>ƒShared Font<6E>„",
"<EFBFBD>ƒWireless Firmware<72>„",
"<EFBFBD>ƒWhitelist<EFBFBD>„",
"<EFBFBD>ƒInstalled Content Version<6F>„",
"Reset HW Setting to Default",
"break HW Setting"
@ -237,8 +239,6 @@ const char *s_strSystemMenu[] = {
".twl-nup-prvkey.der",
".twl-shop-cert.der",
".twl-shop-prvkey.der",
"NintendoCA.der",
"NintendoCA-C2.der",
"NintendoCA-G2.der"
};
@ -252,6 +252,11 @@ const char *s_strWLMenu[] = {
"FW1 type"
};
const char *s_strWhiteMenu[] = {
"Num of Entry",
"Tmd Hash"
};
const char **s_strMetaMenu[] = {
s_strOwnerMenu,
s_strParentalMenu,
@ -264,6 +269,7 @@ const char **s_strMetaMenu[] = {
s_strSystemMenu,
s_strFontMenu,
s_strWLMenu,
s_strWhiteMenu,
NULL,
NULL,
NULL,

22
build/tests/DisplaySystemInformation/ARM9/src/strResource.h
View File

@ -19,7 +19,7 @@
#define __DISPLAY_INFO_RESOURCE__
// メニューID
#define MENU_ROOT 14
#define MENU_ROOT 15
#define MENU_OWNER 0
#define MENU_PARENTAL 1
#define MENU_SECURE_USER 2
@ -31,9 +31,10 @@
#define MENU_SYSMENU 8
#define MENU_FONT 9
#define MENU_WL 10
#define MENU_VERSION 11
#define MENU_RESET_INFO 12
#define MENU_BREAK_DATA 13
#define MENU_WHITE 11
#define MENU_VERSION 12
#define MENU_RESET_INFO 13
#define MENU_BREAK_DATA 14
// 行番号
@ -165,9 +166,7 @@
#define SYSMENU_NUP_PRV 6
#define SYSMENU_SHOP_CERT 7
#define SYSMENU_SHOP_PRV 8
#define SYSMENU_NINTENDO_CA 9
#define SYSMENU_NINTENDO_CAC2 10
#define SYSMENU_NINTENDO_CAG2 11
#define SYSMENU_NINTENDO_CAG2 9
#define SYSMENU_HASH_IDX 5
@ -178,10 +177,13 @@
#define WL_NUM_FW 1
#define WL_FW_TYPE 2
#define WHITE_NUM 0
#define WHITE_HASH 1
#define VERSION_OTHER 0
// 各メニューサイズ
#define ROOTMENU_SIZE 14
#define ROOTMENU_SIZE 15
#define OWNERMENU_SIZE 6
#define PARENTALMENU_SIZE 12
#define SECURE_USER_MENU_SIZE 9
@ -190,9 +192,10 @@
#define SECURE_HW_MENU_SIZE 5
#define SCFG_ARM7_MENU_SIZE 47
#define SCFG_ARM9_MENU_SIZE 24
#define SYSMENU_MENU_SIZE 12
#define SYSMENU_MENU_SIZE 10
#define FONTMENU_SIZE 1
#define WLMENU_SIZE 3
#define WHITEMENU_SIZE 2
#define VERSIONMENU_SIZE 0
@ -210,6 +213,7 @@ extern const char *s_strOtherMenu[];
extern const char *s_strSystemMenu[];
extern const char *s_strFontMenu[] ;
extern const char *s_strWLMenu[];
extern const char *s_strWhiteMenu[];
extern const char **s_strMetaMenu[];
extern const char *s_strARM7RegisterName[];
extern const char *s_strARM9RegisterName[];

1
build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c
View File

@ -176,6 +176,7 @@ void getAllInfo( void )
getSCFGInfo();
getSysmenuInfo();
getFontInfo();
getWhiteListInfo();
getWLInfo();
#if NAM_ENABLE