From 7a6d8600a7e7cbc765369705cffe067949b2288a Mon Sep 17 00:00:00 2001 From: aoki_ryoma Date: Mon, 28 Jul 2008 05:52:11 +0000 Subject: [PATCH] =?UTF-8?q?Makefile=E3=81=AB=E3=82=88=E3=82=8B=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81=E3=81=A7?= =?UTF-8?q?=E3=80=81=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0/=E3=83=A6?= =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=80=81NAND/Gamecard=E3=80=81SCFGLock/Unloc?= =?UTF-8?q?k=E3=81=AE=E6=9D=A1=E4=BB=B6=E5=88=86=E5=B2=90=E3=81=AB?= =?UTF-8?q?=E3=82=88=E3=81=A3=E3=81=A68=E7=A8=AE=E9=A1=9E=E3=81=AE?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92?= =?UTF-8?q?=E7=94=9F=E6=88=90=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82=20=E6=9C=80=E5=88=9D=E3=81=ABLCFGRe?= =?UTF-8?q?adTWLSetting=E3=81=A7=E3=83=87=E3=83=BC=E3=82=BF=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=97=E3=81=9F=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=80=81LCFG=E7=B5=8C=E7=94=B1=E3=81=A7=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=81=99=E3=82=8B=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AF?= =?UTF-8?q?=E5=85=A8=E3=81=A6=E6=98=8E=E7=A4=BA=E7=9A=84=E3=81=ABN/A?= =?UTF-8?q?=E3=81=A8=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?= 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@2011 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../DisplaySystemInformation/ARM9/Makefile | 5 +- .../ARM9/{Makefile.armadillo => Makefile.0} | 60 ++++- .../ARM9/{Makefile.racoon_SCFG => Makefile.1} | 65 ++++- .../{Makefile.racoon_noSCFG => Makefile.2} | 65 ++++- .../DisplaySystemInformation/ARM9/Makefile.3 | 141 ++++++++++ .../DisplaySystemInformation/ARM9/Makefile.4 | 141 ++++++++++ .../DisplaySystemInformation/ARM9/Makefile.5 | 141 ++++++++++ .../DisplaySystemInformation/ARM9/Makefile.6 | 141 ++++++++++ .../DisplaySystemInformation/ARM9/Makefile.7 | 141 ++++++++++ .../DisplaySystemInformation/ARM9/main.rsf | 245 ------------------ .../{main_racoon_SCFG.rsf => main_normal.rsf} | 23 +- .../ARM9/main_racoon.rsf | 245 ------------------ .../ARM9/main_racoon_noSCFG.rsf | 245 ------------------ .../{main_armadillo.rsf => main_secure.rsf} | 12 +- .../ARM9/src/drawFunc.c | 14 +- .../ARM9/src/get_hw.c | 15 +- .../ARM9/src/get_other.c | 131 +++++----- .../ARM9/src/get_sysmenu.c | 84 +++--- .../ARM9/src/get_versionData.c | 35 ++- .../DisplaySystemInformation/ARM9/src/main.c | 2 + .../ARM9/src/viewSystemInfo.c | 8 +- .../ARM9/src/viewSystemInfo.h | 2 + 22 files changed, 1070 insertions(+), 891 deletions(-) rename build/tests/DisplaySystemInformation/ARM9/{Makefile.armadillo => Makefile.0} (65%) rename build/tests/DisplaySystemInformation/ARM9/{Makefile.racoon_SCFG => Makefile.1} (62%) rename build/tests/DisplaySystemInformation/ARM9/{Makefile.racoon_noSCFG => Makefile.2} (62%) create mode 100644 build/tests/DisplaySystemInformation/ARM9/Makefile.3 create mode 100644 build/tests/DisplaySystemInformation/ARM9/Makefile.4 create mode 100644 build/tests/DisplaySystemInformation/ARM9/Makefile.5 create mode 100644 build/tests/DisplaySystemInformation/ARM9/Makefile.6 create mode 100644 build/tests/DisplaySystemInformation/ARM9/Makefile.7 delete mode 100644 build/tests/DisplaySystemInformation/ARM9/main.rsf rename build/tests/DisplaySystemInformation/ARM9/{main_racoon_SCFG.rsf => main_normal.rsf} (88%) delete mode 100644 build/tests/DisplaySystemInformation/ARM9/main_racoon.rsf delete mode 100644 build/tests/DisplaySystemInformation/ARM9/main_racoon_noSCFG.rsf rename build/tests/DisplaySystemInformation/ARM9/{main_armadillo.rsf => main_secure.rsf} (91%) diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile b/build/tests/DisplaySystemInformation/ARM9/Makefile index 8af79702..ddf14f66 100644 --- a/build/tests/DisplaySystemInformation/ARM9/Makefile +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile @@ -17,8 +17,9 @@ #---------------------------------------------------------------------------- SUBDIRS = -#SUBMAKES = Makefile.racoon_SCFG Makefile.racoon_noSCFG Makefile.armadillo -SUBMAKES = Makefile.armadillo +SUBMAKES = Makefile.0 Makefile.1 Makefile.2 Makefile.3\ + Makefile.4 Makefile.5 Makefile.6 Makefile.7 + include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs #---------------------------------------------------------------------------- diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.armadillo b/build/tests/DisplaySystemInformation/ARM9/Makefile.0 similarity index 65% rename from build/tests/DisplaySystemInformation/ARM9/Makefile.armadillo rename to build/tests/DisplaySystemInformation/ARM9/Makefile.0 index 0bb02f52..40f0695b 100644 --- a/build/tests/DisplaySystemInformation/ARM9/Makefile.armadillo +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.0 @@ -18,14 +18,23 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED +###################################### +# +# 分岐条件はここで設定 -MACRO_FLAGS += -DSEA_ENABLE=TRUE +# セキュアアプリかどうか +IS_SECURE_APP = TRUE -# 分岐条件 -DEFAULT_COMP_ARM7 = armadillo -ROM_SPEC = main_$(DEFAULT_COMP_ARM7).rsf -BINDIR = ./bin/$(TWL_BUILDTYPE)/armadillo +# なんどアプリかどうか +IS_NAND_APP = TRUE +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = TRUE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP)\ DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) @@ -71,16 +80,53 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) TARGET_BIN = DisplaySystemInfo.srl +#============================================================================= + include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) - #---------------------------------------------------------------------------- do-build: $(TARGETS) diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.racoon_SCFG b/build/tests/DisplaySystemInformation/ARM9/Makefile.1 similarity index 62% rename from build/tests/DisplaySystemInformation/ARM9/Makefile.racoon_SCFG rename to build/tests/DisplaySystemInformation/ARM9/Makefile.1 index 568e4e07..57c5646a 100644 --- a/build/tests/DisplaySystemInformation/ARM9/Makefile.racoon_SCFG +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.1 @@ -18,12 +18,23 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -MACRO_FLAGS += -DSEA_ENABLE=FALSE +###################################### +# +# 分岐条件はここで設定 -# 分岐条件 -DEFAULT_COMP_ARM7 = racoon -ROM_SPEC = main_racoon_SCFG.rsf -BINDIR = ./bin/$(TWL_BUILDTYPE)/racoon_SCFG +# セキュアアプリかどうか +IS_SECURE_APP = TRUE + +# なんどアプリかどうか +IS_NAND_APP = TRUE + +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = FALSE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP) DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) @@ -33,7 +44,9 @@ SUBDIRS = MISC_DIR = ../../../systemMenu_RED/misc SRCS = main.c viewSystemInfo.c drawFunc.c control.c\ - strResource.c misc.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\ $(MISC_DIR)/src/cmn.c LINCLUDES += $(MISC_DIR)/include \ @@ -67,10 +80,48 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) TARGET_BIN = DisplaySystemInfo.srl +#============================================================================= include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.exe + +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.racoon_noSCFG b/build/tests/DisplaySystemInformation/ARM9/Makefile.2 similarity index 62% rename from build/tests/DisplaySystemInformation/ARM9/Makefile.racoon_noSCFG rename to build/tests/DisplaySystemInformation/ARM9/Makefile.2 index 66584618..d9cddbaa 100644 --- a/build/tests/DisplaySystemInformation/ARM9/Makefile.racoon_noSCFG +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.2 @@ -18,12 +18,23 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -MACRO_FLAGS += -DSEA_ENABLE=FALSE +###################################### +# +# 分岐条件はここで設定 -# 分岐条件 -DEFAULT_COMP_ARM7 = racoon -ROM_SPEC = main_racoon_noSCFG.rsf -BINDIR = ./bin/$(TWL_BUILDTYPE)/racoon_noSCFG +# セキュアアプリかどうか +IS_SECURE_APP = TRUE + +# なんどアプリかどうか +IS_NAND_APP = FALSE + +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = TRUE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP) DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) @@ -33,7 +44,9 @@ SUBDIRS = MISC_DIR = ../../../systemMenu_RED/misc SRCS = main.c viewSystemInfo.c drawFunc.c control.c\ - strResource.c misc.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\ $(MISC_DIR)/src/cmn.c LINCLUDES += $(MISC_DIR)/include \ @@ -67,10 +80,48 @@ LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) TARGET_BIN = DisplaySystemInfo.srl +#============================================================================= include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.exe + +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.3 b/build/tests/DisplaySystemInformation/ARM9/Makefile.3 new file mode 100644 index 00000000..93dbf2c4 --- /dev/null +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.3 @@ -0,0 +1,141 @@ +#/*---------------------------------------------------------------------------* +# Project: TwlIPL - tests - DisplaySystemInformation +# File: makefile +# +# 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$ +# *---------------------------------------------------------------------------*/ +TARGET_FIRM = SYSTEMMENU +TARGET_PLATFORM = TWL +TWL_ARCHGEN = LIMITED + +###################################### +# +# 分岐条件はここで設定 + +# セキュアアプリかどうか +IS_SECURE_APP = TRUE + +# なんどアプリかどうか +IS_NAND_APP = FALSE + +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = FALSE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP) + + +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) + +SUBDIRS = + +MISC_DIR = ../../../systemMenu_RED/misc + +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\ + $(MISC_DIR)/src/cmn.c + +LINCLUDES += $(MISC_DIR)/include \ + $(DISP_INFO)/common/include + +SYSMENU_LIBS = \ + liblcfg$(TWL_LIBSUFFIX).a \ + libsysmenu$(TWL_LIBSUFFIX).a \ + libsysmmcu$(TWL_LIBSUFFIX).a \ + libsysmutil$(TWL_LIBSUFFIX).a \ + libboot$(TWL_LIBSUFFIX).a \ + libds$(TWL_LIBSUFFIX).a \ + libhotsw$(TWL_LIBSUFFIX).a \ + libdht$(TWL_LIBSUFFIX).a \ + libreloc_info$(TWL_LIBSUFFIX).a \ + libnamut$(TWL_LIBSUFFIX).a \ + libsharedfont_launcher$(TWL_LIBSUFFIX).a \ + WDS$(TWL_LIBSUFFIX).a + +SDK_APPEND_LIBS = \ + libes$(TWL_LIBSUFFIX).a \ + libboc$(TWL_LIBSUFFIX).a \ + libsfs$(TWL_LIBSUFFIX).a \ + libnam$(TWL_LIBSUFFIX).a \ + libsea$(TWL_LIBSUFFIX).a \ + libreboot$(TWL_LIBSUFFIX).a \ + libna$(TWL_LIBSUFFIX).a + +LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) + + +TARGET_BIN = DisplaySystemInfo.srl + +#============================================================================= + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + + +DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) +DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) + + +#---------------------------------------------------------------------------- +do-build: $(TARGETS) + +#---------------------------------------------------------------------------- + + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +#include $(TWLSDK_ROOT)/build/buildtools/modulerules +#include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.4 b/build/tests/DisplaySystemInformation/ARM9/Makefile.4 new file mode 100644 index 00000000..2435c0a9 --- /dev/null +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.4 @@ -0,0 +1,141 @@ +#/*---------------------------------------------------------------------------* +# Project: TwlIPL - tests - DisplaySystemInformation +# File: makefile +# +# 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$ +# *---------------------------------------------------------------------------*/ +TARGET_FIRM = SYSTEMMENU +TARGET_PLATFORM = TWL +TWL_ARCHGEN = LIMITED + +###################################### +# +# 分岐条件はここで設定 + +# セキュアアプリかどうか +IS_SECURE_APP = FALSE + +# なんどアプリかどうか +IS_NAND_APP = TRUE + +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = TRUE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP) + + +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) + +SUBDIRS = + +MISC_DIR = ../../../systemMenu_RED/misc + +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\ + $(MISC_DIR)/src/cmn.c + +LINCLUDES += $(MISC_DIR)/include \ + $(DISP_INFO)/common/include + +SYSMENU_LIBS = \ + liblcfg$(TWL_LIBSUFFIX).a \ + libsysmenu$(TWL_LIBSUFFIX).a \ + libsysmmcu$(TWL_LIBSUFFIX).a \ + libsysmutil$(TWL_LIBSUFFIX).a \ + libboot$(TWL_LIBSUFFIX).a \ + libds$(TWL_LIBSUFFIX).a \ + libhotsw$(TWL_LIBSUFFIX).a \ + libdht$(TWL_LIBSUFFIX).a \ + libreloc_info$(TWL_LIBSUFFIX).a \ + libnamut$(TWL_LIBSUFFIX).a \ + libsharedfont_launcher$(TWL_LIBSUFFIX).a \ + WDS$(TWL_LIBSUFFIX).a + +SDK_APPEND_LIBS = \ + libes$(TWL_LIBSUFFIX).a \ + libboc$(TWL_LIBSUFFIX).a \ + libsfs$(TWL_LIBSUFFIX).a \ + libnam$(TWL_LIBSUFFIX).a \ + libsea$(TWL_LIBSUFFIX).a \ + libreboot$(TWL_LIBSUFFIX).a \ + libna$(TWL_LIBSUFFIX).a + +LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) + + +TARGET_BIN = DisplaySystemInfo.srl + +#============================================================================= + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + + +DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) +DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) + + +#---------------------------------------------------------------------------- +do-build: $(TARGETS) + +#---------------------------------------------------------------------------- + + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +#include $(TWLSDK_ROOT)/build/buildtools/modulerules +#include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.5 b/build/tests/DisplaySystemInformation/ARM9/Makefile.5 new file mode 100644 index 00000000..a880def3 --- /dev/null +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.5 @@ -0,0 +1,141 @@ +#/*---------------------------------------------------------------------------* +# Project: TwlIPL - tests - DisplaySystemInformation +# File: makefile +# +# 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$ +# *---------------------------------------------------------------------------*/ +TARGET_FIRM = SYSTEMMENU +TARGET_PLATFORM = TWL +TWL_ARCHGEN = LIMITED + +###################################### +# +# 分岐条件はここで設定 + +# セキュアアプリかどうか +IS_SECURE_APP = FALSE + +# なんどアプリかどうか +IS_NAND_APP = TRUE + +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = FALSE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP) + + +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) + +SUBDIRS = + +MISC_DIR = ../../../systemMenu_RED/misc + +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\ + $(MISC_DIR)/src/cmn.c + +LINCLUDES += $(MISC_DIR)/include \ + $(DISP_INFO)/common/include + +SYSMENU_LIBS = \ + liblcfg$(TWL_LIBSUFFIX).a \ + libsysmenu$(TWL_LIBSUFFIX).a \ + libsysmmcu$(TWL_LIBSUFFIX).a \ + libsysmutil$(TWL_LIBSUFFIX).a \ + libboot$(TWL_LIBSUFFIX).a \ + libds$(TWL_LIBSUFFIX).a \ + libhotsw$(TWL_LIBSUFFIX).a \ + libdht$(TWL_LIBSUFFIX).a \ + libreloc_info$(TWL_LIBSUFFIX).a \ + libnamut$(TWL_LIBSUFFIX).a \ + libsharedfont_launcher$(TWL_LIBSUFFIX).a \ + WDS$(TWL_LIBSUFFIX).a + +SDK_APPEND_LIBS = \ + libes$(TWL_LIBSUFFIX).a \ + libboc$(TWL_LIBSUFFIX).a \ + libsfs$(TWL_LIBSUFFIX).a \ + libnam$(TWL_LIBSUFFIX).a \ + libsea$(TWL_LIBSUFFIX).a \ + libreboot$(TWL_LIBSUFFIX).a \ + libna$(TWL_LIBSUFFIX).a + +LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) + + +TARGET_BIN = DisplaySystemInfo.srl + +#============================================================================= + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + + +DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) +DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) + + +#---------------------------------------------------------------------------- +do-build: $(TARGETS) + +#---------------------------------------------------------------------------- + + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +#include $(TWLSDK_ROOT)/build/buildtools/modulerules +#include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.6 b/build/tests/DisplaySystemInformation/ARM9/Makefile.6 new file mode 100644 index 00000000..8f38ed41 --- /dev/null +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.6 @@ -0,0 +1,141 @@ +#/*---------------------------------------------------------------------------* +# Project: TwlIPL - tests - DisplaySystemInformation +# File: makefile +# +# 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$ +# *---------------------------------------------------------------------------*/ +TARGET_FIRM = SYSTEMMENU +TARGET_PLATFORM = TWL +TWL_ARCHGEN = LIMITED + +###################################### +# +# 分岐条件はここで設定 + +# セキュアアプリかどうか +IS_SECURE_APP = FALSE + +# なんどアプリかどうか +IS_NAND_APP = FALSE + +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = TRUE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP) + + +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) + +SUBDIRS = + +MISC_DIR = ../../../systemMenu_RED/misc + +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\ + $(MISC_DIR)/src/cmn.c + +LINCLUDES += $(MISC_DIR)/include \ + $(DISP_INFO)/common/include + +SYSMENU_LIBS = \ + liblcfg$(TWL_LIBSUFFIX).a \ + libsysmenu$(TWL_LIBSUFFIX).a \ + libsysmmcu$(TWL_LIBSUFFIX).a \ + libsysmutil$(TWL_LIBSUFFIX).a \ + libboot$(TWL_LIBSUFFIX).a \ + libds$(TWL_LIBSUFFIX).a \ + libhotsw$(TWL_LIBSUFFIX).a \ + libdht$(TWL_LIBSUFFIX).a \ + libreloc_info$(TWL_LIBSUFFIX).a \ + libnamut$(TWL_LIBSUFFIX).a \ + libsharedfont_launcher$(TWL_LIBSUFFIX).a \ + WDS$(TWL_LIBSUFFIX).a + +SDK_APPEND_LIBS = \ + libes$(TWL_LIBSUFFIX).a \ + libboc$(TWL_LIBSUFFIX).a \ + libsfs$(TWL_LIBSUFFIX).a \ + libnam$(TWL_LIBSUFFIX).a \ + libsea$(TWL_LIBSUFFIX).a \ + libreboot$(TWL_LIBSUFFIX).a \ + libna$(TWL_LIBSUFFIX).a + +LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) + + +TARGET_BIN = DisplaySystemInfo.srl + +#============================================================================= + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + + +DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) +DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) + + +#---------------------------------------------------------------------------- +do-build: $(TARGETS) + +#---------------------------------------------------------------------------- + + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +#include $(TWLSDK_ROOT)/build/buildtools/modulerules +#include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile.7 b/build/tests/DisplaySystemInformation/ARM9/Makefile.7 new file mode 100644 index 00000000..218c321d --- /dev/null +++ b/build/tests/DisplaySystemInformation/ARM9/Makefile.7 @@ -0,0 +1,141 @@ +#/*---------------------------------------------------------------------------* +# Project: TwlIPL - tests - DisplaySystemInformation +# File: makefile +# +# 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$ +# *---------------------------------------------------------------------------*/ +TARGET_FIRM = SYSTEMMENU +TARGET_PLATFORM = TWL +TWL_ARCHGEN = LIMITED + +###################################### +# +# 分岐条件はここで設定 + +# セキュアアプリかどうか +IS_SECURE_APP = FALSE + +# なんどアプリかどうか +IS_NAND_APP = FALSE + +# SCFGをロックして見れなくするかどうか +INVISIBLE_SCFG = FALSE +# +###################################### + + +MACRO_FLAGS += -DNAM_ENABLE=$(IS_SECURE_APP) + + +DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) + +SUBDIRS = + +MISC_DIR = ../../../systemMenu_RED/misc + +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\ + $(MISC_DIR)/src/cmn.c + +LINCLUDES += $(MISC_DIR)/include \ + $(DISP_INFO)/common/include + +SYSMENU_LIBS = \ + liblcfg$(TWL_LIBSUFFIX).a \ + libsysmenu$(TWL_LIBSUFFIX).a \ + libsysmmcu$(TWL_LIBSUFFIX).a \ + libsysmutil$(TWL_LIBSUFFIX).a \ + libboot$(TWL_LIBSUFFIX).a \ + libds$(TWL_LIBSUFFIX).a \ + libhotsw$(TWL_LIBSUFFIX).a \ + libdht$(TWL_LIBSUFFIX).a \ + libreloc_info$(TWL_LIBSUFFIX).a \ + libnamut$(TWL_LIBSUFFIX).a \ + libsharedfont_launcher$(TWL_LIBSUFFIX).a \ + WDS$(TWL_LIBSUFFIX).a + +SDK_APPEND_LIBS = \ + libes$(TWL_LIBSUFFIX).a \ + libboc$(TWL_LIBSUFFIX).a \ + libsfs$(TWL_LIBSUFFIX).a \ + libnam$(TWL_LIBSUFFIX).a \ + libsea$(TWL_LIBSUFFIX).a \ + libreboot$(TWL_LIBSUFFIX).a \ + libna$(TWL_LIBSUFFIX).a + +LLIBRARIES += $(SYSMENU_LIBS) $(SDK_APPEND_LIBS) + + +TARGET_BIN = DisplaySystemInfo.srl + +#============================================================================= + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +ifeq ($(IS_SECURE_APP),TRUE) + DEFAULT_COMP_ARM7 = armadillo + WRAM_MAP = MAP_TS_SCR + APPTYPE = SYSTEM + MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe + ROM_SPEC = main_secure.rsf +else + WRAM_MAP = $(MAKEROM_WRAM_MAPPING) + DEFAULT_COMP_ARM7 = racoon + APPTYPE = USER + ROM_SPEC = main_normal.rsf +endif + +ifeq ($(IS_NAND_APP),TRUE) + MEDIA = NAND +else + MEDIA = GAMECARD +endif + + +ifeq ($(INVISIBLE_SCFG),TRUE) + SCFG_SUFFIX = LockSCFG +else + SCFG_SUFFIX = UnlockSCFG +endif + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) +OBJDIR = ./obj/$(TWL_BUILDTYPE)/$(APPTYPE)_$(MEDIA)_$(SCFG_SUFFIX) + + +MAKEROM_FLAGS += -DDISPINFO_WRAM_MAP=$(WRAM_MAP) \ + -DDISPINFO_APPTYPE=$(APPTYPE) \ + -DDISPINFO_SECURE=$(IS_SECURE_APP) \ + -DDISPINFO_MEDIA=$(MEDIA) \ + -DDISPINFO_NANDACCESS=$(IS_NAND_APP) \ + -DDISPINFO_LOCKSCFG=$(INVISIBLE_SCFG) + + +DEFAULT_MAKEROM_ARM7_BASE = ../ARM7_$(DEFAULT_COMP_ARM7)/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) +DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) + + +#---------------------------------------------------------------------------- +do-build: $(TARGETS) + +#---------------------------------------------------------------------------- + + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +#include $(TWLSDK_ROOT)/build/buildtools/modulerules +#include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/tests/DisplaySystemInformation/ARM9/main.rsf b/build/tests/DisplaySystemInformation/ARM9/main.rsf deleted file mode 100644 index df4af035..00000000 --- a/build/tests/DisplaySystemInformation/ARM9/main.rsf +++ /dev/null @@ -1,245 +0,0 @@ -#---------------------------------------------------------------------------- -# Project: TwlSDK - include -# File: ROM-TS.rsf -# -# Copyright 2007 Nintendo. All rights reserved. -# -# These coded insructions, 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$ -#---------------------------------------------------------------------------- -# -# TWL ROM SPEC FILE -# - -Arm9 -{ - Static "$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)" - OverlayDefs "$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)" - OverlayTable "$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)" - Elf "$(MAKEROM_ARM9:r).tef" -} - -Arm7 -{ - Static "$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)" - OverlayDefs "$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)" - OverlayTable "$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)" - Elf "$(MAKEROM_ARM7_BASE:r).tef" -} - -Arm9.Ltd -{ - Static "$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)" - OverlayDefs "$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)" - OverlayTable "$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)" -} - -Arm7.Ltd -{ - Static "$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)" - OverlayDefs "$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)" - OverlayTable "$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)" -} - -Property -{ - ### - ### Settings for FinalROM - ### - #### BEGIN - # - # TITLE NAME: Your product name within 12bytes - # - #TitleName "YourAppName" - - # - # MAKER CODE: Your company ID# in 2 ascii words - # issued by NINTENDO - # - #MakerCode "00" - - # - # REMASTER VERSION: Mastering version - # - #RomVersion 0 - - # - # ROM SPEED TYPE: [MROM/1TROM/UNDEFINED] - # - RomSpeedType $(MAKEROM_ROMSPEED) - - # - # ROM SIZE: in bit [64M/128M/256M/512M/1G/2G] - # - #RomSize 128M - #RomSize 256M - - # - # ROM PADDING: TRUE if finalrom - # - #RomFootPadding TRUE - - # - # ROM HEADER TEMPLATE: Provided to every product by NINTENDO - # - #RomHeaderTemplate ./etc/rom_header.template.sbin - - # - # BANNER FILE: generated from Banner Spec File - # - #BannerFile ./etc/myGameBanner.bnr - BannerFile $(TWLSDK_ROOT)/include/twl/specfiles/default.bnr - - # - # Permit LandingNormalJump: for TWL "ApplicationJump" function [TRUE/FALSE] - # - #PermitLandingNormalJump FALSE - - # - # Permit LandingTmpJump: for TWL "ApplicationJump" function [TRUE/FALSE] - # - #PermitLandingTmpJump FALSE - - ### - ### Setting for TWL - ### - - # - # ROM HEADER Ltd: Provided to every product by NINTENDO - # - RomHeaderLtd $(TWLSDK_ROOT)/tools/bin/rom_header.LTD.sbin - - # - # Digest parameters: - # - DigestParam 1024 32 - - # - # WRAM mapping: [MAP_BB_HYB/MAP_BB_LTD/MAP_TS_HYB/MAP_TS_LTD - # MAP2_BB_HYB/MAP2_BB_LTD/MAP2_TS_HYB/MAP2_TS_LTD] - # don't have to edit - # - WramMapping MAP_TS_SCR - - # - # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] - # - CardRegion Japan - - # - # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] - # - #CommonClientKey FALSE - - # - # HwAESSlotB: launcher deliver HW AES slot B setting [TRUE/FALSE] - # - #HwAESSlotB FALSE - - # - # HwAESSlotC: launcher deliver HW AES slot C setting [TRUE/FALSE] - # - #HwAESSlotC FALSE - - # - # SDCardAccess: sd card access control [TRUE/FALSE] - # - #SDCardAccess FALSE - - # - # NANDAccess: NAND access control [TRUE/FALSE] - # - #NANDAccess FALSE - NANDAccess TRUE - - # - # Codec mode: - # don't have to edit - # - CodecMode $(MAKEROM_CODEC_MODE) - - # - # Disp WiFiConnection Icon for Launcher [TRUE/FALSE] - # - #WiFiConnectionIcon FALSE - - # - # Disp DSWireless Icon for Launcher [TRUE/FALSE] - # - #DSWirelessIcon FALSE - LockSCFG FALSE - - - ### - #### END -} - -AppendProperty -{ - # - # Publisher : "Nintendo" - # don't have to edit - Publisher Nintendo - - # - # Application type : [USER/SYSTEM] - # don't have to edit - AppType SYSTEM - - # - # launch title on the launcher : [TRUE/FALSE] - # don't have to edit - Launch TRUE - - # - # Boot allowed Media: [GameCard] - # - Media NAND - - # - # Data only title : [TRUE/FALSE] - # don't have to edit - #DataOnly FALSE - - # - # Secure title : [TRUE/FALSE] - # don't have to edit - Secure TRUE - - # - # GameCode for TitleID : Your GameCode in 4 ascii words - # - GameCode ABCJ - - # - # Public save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M] - # - #PublicSaveDataSize 32K - - # - # Private save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M] - # - #PrivateSaveDataSize 16K - - # - # Enable SubBannerFile - #SubBannerFile TRUE - -} - -RomSpec -{ - Offset 0x00000000 - Segment ALL - HostRoot ../../../systemMenu_RED/data - Root /data - File NTR_IPL_font_m.NFTR - -} diff --git a/build/tests/DisplaySystemInformation/ARM9/main_racoon_SCFG.rsf b/build/tests/DisplaySystemInformation/ARM9/main_normal.rsf similarity index 88% rename from build/tests/DisplaySystemInformation/ARM9/main_racoon_SCFG.rsf rename to build/tests/DisplaySystemInformation/ARM9/main_normal.rsf index 776e33c2..4ebe6cfd 100644 --- a/build/tests/DisplaySystemInformation/ARM9/main_racoon_SCFG.rsf +++ b/build/tests/DisplaySystemInformation/ARM9/main_normal.rsf @@ -57,13 +57,13 @@ Property # # TITLE NAME: Your product name within 12bytes # - #TitleName "YourAppName" + TitleName "DispInfo" # # MAKER CODE: Your company ID# in 2 ascii words # issued by NINTENDO # - #MakerCode "00" + MakerCode 01 # # REMASTER VERSION: Mastering version @@ -131,7 +131,7 @@ Property # # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] # - CardRegion Japan + CardRegion ALL # # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] @@ -151,13 +151,13 @@ Property # # SDCardAccess: sd card access control [TRUE/FALSE] # - #SDCardAccess FALSE + #SDCardAccess $(DISPINFO_SDACCESS) # # NANDAccess: NAND access control [TRUE/FALSE] # #NANDAccess FALSE - NANDAccess TRUE + NANDAccess $(DISPINFO_NANDACCESS) # # Codec mode: @@ -174,8 +174,11 @@ Property # Disp DSWireless Icon for Launcher [TRUE/FALSE] # #DSWirelessIcon FALSE - LockSCFG FALSE + LockSCFG $(DISPINFO_LOCKSCFG) + +# AESSlotフラグはノーマルアプリでは利用できない +# HwAESSlotA_SSLClientCert TRUE ### #### END @@ -191,7 +194,7 @@ AppendProperty # # Application type : [USER/SYSTEM] # don't have to edit - #AppType SYSTEM + AppType $(DISPINFO_APPTYPE) # # launch title on the launcher : [TRUE/FALSE] @@ -201,7 +204,7 @@ AppendProperty # # Boot allowed Media: [GameCard] # - Media NAND + Media $(DISPINFO_MEDIA) # # Data only title : [TRUE/FALSE] @@ -211,12 +214,12 @@ AppendProperty # # Secure title : [TRUE/FALSE] # don't have to edit - #Secure TRUE + Secure $(DISPINFO_SECURE) # # GameCode for TitleID : Your GameCode in 4 ascii words # - GameCode ABCJ + GameCode ABCZ # # Public save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M] diff --git a/build/tests/DisplaySystemInformation/ARM9/main_racoon.rsf b/build/tests/DisplaySystemInformation/ARM9/main_racoon.rsf deleted file mode 100644 index 9f06a64c..00000000 --- a/build/tests/DisplaySystemInformation/ARM9/main_racoon.rsf +++ /dev/null @@ -1,245 +0,0 @@ -#---------------------------------------------------------------------------- -# Project: TwlSDK - include -# File: ROM-TS.rsf -# -# Copyright 2007 Nintendo. All rights reserved. -# -# These coded insructions, 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$ -#---------------------------------------------------------------------------- -# -# TWL ROM SPEC FILE -# - -Arm9 -{ - Static "$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)" - OverlayDefs "$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)" - OverlayTable "$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)" - Elf "$(MAKEROM_ARM9:r).tef" -} - -Arm7 -{ - Static "$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)" - OverlayDefs "$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)" - OverlayTable "$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)" - Elf "$(MAKEROM_ARM7_BASE:r).tef" -} - -Arm9.Ltd -{ - Static "$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)" - OverlayDefs "$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)" - OverlayTable "$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)" -} - -Arm7.Ltd -{ - Static "$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)" - OverlayDefs "$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)" - OverlayTable "$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)" -} - -Property -{ - ### - ### Settings for FinalROM - ### - #### BEGIN - # - # TITLE NAME: Your product name within 12bytes - # - #TitleName "YourAppName" - - # - # MAKER CODE: Your company ID# in 2 ascii words - # issued by NINTENDO - # - #MakerCode "00" - - # - # REMASTER VERSION: Mastering version - # - #RomVersion 0 - - # - # ROM SPEED TYPE: [MROM/1TROM/UNDEFINED] - # - RomSpeedType $(MAKEROM_ROMSPEED) - - # - # ROM SIZE: in bit [64M/128M/256M/512M/1G/2G] - # - #RomSize 128M - #RomSize 256M - - # - # ROM PADDING: TRUE if finalrom - # - #RomFootPadding TRUE - - # - # ROM HEADER TEMPLATE: Provided to every product by NINTENDO - # - #RomHeaderTemplate ./etc/rom_header.template.sbin - - # - # BANNER FILE: generated from Banner Spec File - # - #BannerFile ./etc/myGameBanner.bnr - BannerFile $(TWLSDK_ROOT)/include/twl/specfiles/default.bnr - - # - # Permit LandingNormalJump: for TWL "ApplicationJump" function [TRUE/FALSE] - # - #PermitLandingNormalJump FALSE - - # - # Permit LandingTmpJump: for TWL "ApplicationJump" function [TRUE/FALSE] - # - #PermitLandingTmpJump FALSE - - ### - ### Setting for TWL - ### - - # - # ROM HEADER Ltd: Provided to every product by NINTENDO - # - RomHeaderLtd $(TWLSDK_ROOT)/tools/bin/rom_header.LTD.sbin - - # - # Digest parameters: - # - DigestParam 1024 32 - - # - # WRAM mapping: [MAP_BB_HYB/MAP_BB_LTD/MAP_TS_HYB/MAP_TS_LTD - # MAP2_BB_HYB/MAP2_BB_LTD/MAP2_TS_HYB/MAP2_TS_LTD] - # don't have to edit - # - WramMapping $(MAKEROM_WRAM_MAPPING) - - # - # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] - # - CardRegion Japan - - # - # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] - # - #CommonClientKey FALSE - - # - # HwAESSlotB: launcher deliver HW AES slot B setting [TRUE/FALSE] - # - #HwAESSlotB FALSE - - # - # HwAESSlotC: launcher deliver HW AES slot C setting [TRUE/FALSE] - # - #HwAESSlotC FALSE - - # - # SDCardAccess: sd card access control [TRUE/FALSE] - # - #SDCardAccess FALSE - - # - # NANDAccess: NAND access control [TRUE/FALSE] - # - #NANDAccess FALSE - NANDAccess TRUE - - # - # Codec mode: - # don't have to edit - # - CodecMode $(MAKEROM_CODEC_MODE) - - # - # Disp WiFiConnection Icon for Launcher [TRUE/FALSE] - # - #WiFiConnectionIcon FALSE - - # - # Disp DSWireless Icon for Launcher [TRUE/FALSE] - # - #DSWirelessIcon FALSE - LockSCFG FALSE - - - ### - #### END -} - -AppendProperty -{ - # - # Publisher : "Nintendo" - # don't have to edit - Publisher Nintendo - - # - # Application type : [USER/SYSTEM] - # don't have to edit - AppType SYSTEM - - # - # launch title on the launcher : [TRUE/FALSE] - # don't have to edit - Launch TRUE - - # - # Boot allowed Media: [GameCard] - # - Media NAND - - # - # Data only title : [TRUE/FALSE] - # don't have to edit - #DataOnly FALSE - - # - # Secure title : [TRUE/FALSE] - # don't have to edit - Secure TRUE - - # - # GameCode for TitleID : Your GameCode in 4 ascii words - # - GameCode ABCJ - - # - # Public save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M] - # - #PublicSaveDataSize 32K - - # - # Private save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M] - # - #PrivateSaveDataSize 16K - - # - # Enable SubBannerFile - #SubBannerFile TRUE - -} - -RomSpec -{ - Offset 0x00000000 - Segment ALL - HostRoot ../../../systemMenu_RED/data - Root /data - File NTR_IPL_font_m.NFTR - -} diff --git a/build/tests/DisplaySystemInformation/ARM9/main_racoon_noSCFG.rsf b/build/tests/DisplaySystemInformation/ARM9/main_racoon_noSCFG.rsf deleted file mode 100644 index d392a63e..00000000 --- a/build/tests/DisplaySystemInformation/ARM9/main_racoon_noSCFG.rsf +++ /dev/null @@ -1,245 +0,0 @@ -#---------------------------------------------------------------------------- -# Project: TwlSDK - include -# File: ROM-TS.rsf -# -# Copyright 2007 Nintendo. All rights reserved. -# -# These coded insructions, 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$ -#---------------------------------------------------------------------------- -# -# TWL ROM SPEC FILE -# - -Arm9 -{ - Static "$(MAKEROM_ARM9:r).TWL.FLX.sbin$(COMPSUFFIX9)" - OverlayDefs "$(MAKEROM_ARM9:r)_defs.TWL.FLX.sbin$(COMPSUFFIX9)" - OverlayTable "$(MAKEROM_ARM9:r)_table.TWL.FLX.sbin$(COMPSUFFIX9)" - Elf "$(MAKEROM_ARM9:r).tef" -} - -Arm7 -{ - Static "$(MAKEROM_ARM7_BASE:r).TWL.FLX.sbin$(COMPSUFFIX7)" - OverlayDefs "$(MAKEROM_ARM7_BASE:r)_defs.TWL.FLX.sbin$(COMPSUFFIX7)" - OverlayTable "$(MAKEROM_ARM7_BASE:r)_table.TWL.FLX.sbin$(COMPSUFFIX7)" - Elf "$(MAKEROM_ARM7_BASE:r).tef" -} - -Arm9.Ltd -{ - Static "$(MAKEROM_ARM9:r).TWL.LTD.sbin$(COMPSUFFIX9)" - OverlayDefs "$(MAKEROM_ARM9:r)_defs.TWL.LTD.sbin$(COMPSUFFIX9)" - OverlayTable "$(MAKEROM_ARM9:r)_table.TWL.LTD.sbin$(COMPSUFFIX9)" -} - -Arm7.Ltd -{ - Static "$(MAKEROM_ARM7_BASE:r).TWL.LTD.sbin$(COMPSUFFIX7)" - OverlayDefs "$(MAKEROM_ARM7_BASE:r)_defs.TWL.LTD.sbin$(COMPSUFFIX7)" - OverlayTable "$(MAKEROM_ARM7_BASE:r)_table.TWL.LTD.sbin$(COMPSUFFIX7)" -} - -Property -{ - ### - ### Settings for FinalROM - ### - #### BEGIN - # - # TITLE NAME: Your product name within 12bytes - # - #TitleName "YourAppName" - - # - # MAKER CODE: Your company ID# in 2 ascii words - # issued by NINTENDO - # - #MakerCode "00" - - # - # REMASTER VERSION: Mastering version - # - #RomVersion 0 - - # - # ROM SPEED TYPE: [MROM/1TROM/UNDEFINED] - # - RomSpeedType $(MAKEROM_ROMSPEED) - - # - # ROM SIZE: in bit [64M/128M/256M/512M/1G/2G] - # - #RomSize 128M - #RomSize 256M - - # - # ROM PADDING: TRUE if finalrom - # - #RomFootPadding TRUE - - # - # ROM HEADER TEMPLATE: Provided to every product by NINTENDO - # - #RomHeaderTemplate ./etc/rom_header.template.sbin - - # - # BANNER FILE: generated from Banner Spec File - # - #BannerFile ./etc/myGameBanner.bnr - BannerFile $(TWLSDK_ROOT)/include/twl/specfiles/default.bnr - - # - # Permit LandingNormalJump: for TWL "ApplicationJump" function [TRUE/FALSE] - # - #PermitLandingNormalJump FALSE - - # - # Permit LandingTmpJump: for TWL "ApplicationJump" function [TRUE/FALSE] - # - #PermitLandingTmpJump FALSE - - ### - ### Setting for TWL - ### - - # - # ROM HEADER Ltd: Provided to every product by NINTENDO - # - RomHeaderLtd $(TWLSDK_ROOT)/tools/bin/rom_header.LTD.sbin - - # - # Digest parameters: - # - DigestParam 1024 32 - - # - # WRAM mapping: [MAP_BB_HYB/MAP_BB_LTD/MAP_TS_HYB/MAP_TS_LTD - # MAP2_BB_HYB/MAP2_BB_LTD/MAP2_TS_HYB/MAP2_TS_LTD] - # don't have to edit - # - WramMapping $(MAKEROM_WRAM_MAPPING) - - # - # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] - # - CardRegion Japan - - # - # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] - # - #CommonClientKey FALSE - - # - # HwAESSlotB: launcher deliver HW AES slot B setting [TRUE/FALSE] - # - #HwAESSlotB FALSE - - # - # HwAESSlotC: launcher deliver HW AES slot C setting [TRUE/FALSE] - # - #HwAESSlotC FALSE - - # - # SDCardAccess: sd card access control [TRUE/FALSE] - # - #SDCardAccess FALSE - - # - # NANDAccess: NAND access control [TRUE/FALSE] - # - #NANDAccess FALSE - NANDAccess TRUE - - # - # Codec mode: - # don't have to edit - # - CodecMode $(MAKEROM_CODEC_MODE) - - # - # Disp WiFiConnection Icon for Launcher [TRUE/FALSE] - # - #WiFiConnectionIcon FALSE - - # - # Disp DSWireless Icon for Launcher [TRUE/FALSE] - # - #DSWirelessIcon FALSE - #LockSCFG FALSE - - - ### - #### END -} - -AppendProperty -{ - # - # Publisher : "Nintendo" - # don't have to edit - Publisher Nintendo - - # - # Application type : [USER/SYSTEM] - # don't have to edit - #AppType SYSTEM - - # - # launch title on the launcher : [TRUE/FALSE] - # don't have to edit - Launch TRUE - - # - # Boot allowed Media: [GameCard] - # - Media NAND - - # - # Data only title : [TRUE/FALSE] - # don't have to edit - #DataOnly FALSE - - # - # Secure title : [TRUE/FALSE] - # don't have to edit - #Secure TRUE - - # - # GameCode for TitleID : Your GameCode in 4 ascii words - # - GameCode ABCJ - - # - # Public save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M] - # - #PublicSaveDataSize 32K - - # - # Private save data size: [0K/16K/32K/64K/128K/256K/512K/1M/2M/4M] - # - #PrivateSaveDataSize 16K - - # - # Enable SubBannerFile - #SubBannerFile TRUE - -} - -RomSpec -{ - Offset 0x00000000 - Segment ALL - HostRoot ../../../systemMenu_RED/data - Root /data - File NTR_IPL_font_m.NFTR - -} diff --git a/build/tests/DisplaySystemInformation/ARM9/main_armadillo.rsf b/build/tests/DisplaySystemInformation/ARM9/main_secure.rsf similarity index 91% rename from build/tests/DisplaySystemInformation/ARM9/main_armadillo.rsf rename to build/tests/DisplaySystemInformation/ARM9/main_secure.rsf index 25b36c47..ab66c036 100644 --- a/build/tests/DisplaySystemInformation/ARM9/main_armadillo.rsf +++ b/build/tests/DisplaySystemInformation/ARM9/main_secure.rsf @@ -151,13 +151,13 @@ Property # # SDCardAccess: sd card access control [TRUE/FALSE] # - #SDCardAccess FALSE + #SDCardAccess $(DISPINFO_SDACCESS) # # NANDAccess: NAND access control [TRUE/FALSE] # #NANDAccess FALSE - NANDAccess TRUE + NANDAccess $(DISPINFO_NANDACCESS) # # Codec mode: @@ -174,8 +174,8 @@ Property # Disp DSWireless Icon for Launcher [TRUE/FALSE] # #DSWirelessIcon FALSE - LockSCFG FALSE + LockSCFG $(DISPINFO_LOCKSCFG) HwAESSlotA_SSLClientCert TRUE ### @@ -192,7 +192,7 @@ AppendProperty # # Application type : [USER/SYSTEM] # don't have to edit - AppType SYSTEM + AppType $(DISPINFO_APPTYPE) # # launch title on the launcher : [TRUE/FALSE] @@ -202,7 +202,7 @@ AppendProperty # # Boot allowed Media: [GameCard] # - Media NAND + Media $(DISPINFO_MEDIA) # # Data only title : [TRUE/FALSE] @@ -212,7 +212,7 @@ AppendProperty # # Secure title : [TRUE/FALSE] # don't have to edit - Secure TRUE + Secure $(DISPINFO_SECURE) # # GameCode for TitleID : Your GameCode in 4 ascii words diff --git a/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c b/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c index b6fe156e..9dbbd1ad 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c @@ -226,6 +226,13 @@ void printValue( int menu,int entryLine, int drawOffset, DispInfoEntry *entry ) if( menu == MENU_SECURE_HW && entryLine == SECURE_HW_TITLEID_LO ) { char buf[5]; + + if( entry->iValue == 0 ) + { + // 情報が受け取れていない状態 + PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET * (1 + drawOffset), txtColor, s_strNA ); + } + MI_CpuCopy( &(entry->iValue), buf, 4 ); buf[4] = '\0'; PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET * (1 + drawOffset), txtColor, "%s", buf ); @@ -236,7 +243,7 @@ void printValue( int menu,int entryLine, int drawOffset, DispInfoEntry *entry ) { // 16文字を8文字の二段組みに変更 char buf[9] = {0}; - STD_StrLCpy( buf, entry->str.sjis , 8 ); + STD_StrLCpy( buf, entry->str.sjis , 9 ); PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET * drawOffset, txtColor, "%s", buf ); PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET * (1+drawOffset), txtColor, "%s", &(entry->str.sjis[8]) ); return; @@ -254,7 +261,7 @@ void printValue( int menu,int entryLine, int drawOffset, DispInfoEntry *entry ) PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET * ( drawOffset + lineOffset++), txtColor, "%s", buf ); } - entry->numLines = lineOffset; + entry->numLines = lineOffset > 0 ? lineOffset : 1; return; } @@ -270,7 +277,8 @@ void printValue( int menu,int entryLine, int drawOffset, DispInfoEntry *entry ) PutStringUTF16( VALUE_LEFT, VALUE_UP + LINE_OFFSET * ( drawOffset + lineOffset++), txtColor, buf ); } - entry->numLines = lineOffset; + // 項目が空文字しかないときでも1行表示だけはされるようにする + entry->numLines = lineOffset > 0 ? lineOffset : 1; return; } diff --git a/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c b/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c index 2d5e1649..7eebaca4 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c @@ -18,8 +18,6 @@ void getHWInfo( void ) } - - void getNormalHWInfo( void ) { int value; @@ -94,10 +92,15 @@ void getSecureHWInfo( void ) titleIDLo[3] << 8*0 ); gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].iValue = value; - gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].isNumData = TRUE;; - gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].isAligned = FALSE; - gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].numLines = 2; - gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].fromLCFG = TRUE; + gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].isNumData = TRUE; } + else + { + gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].str.sjis = s_strNA; + } + + gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].isAligned = FALSE; + gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].numLines = 2; + gAllInfo[MENU_SECURE_HW][SECURE_HW_TITLEID_LO].fromLCFG = TRUE; } diff --git a/build/tests/DisplaySystemInformation/ARM9/src/get_other.c b/build/tests/DisplaySystemInformation/ARM9/src/get_other.c index d727b73d..977c03d4 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/get_other.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/get_other.c @@ -22,92 +22,105 @@ void getOtherInfo( void ) gAllInfo[MENU_OTHER][OTHER_WIRELESS].iValue = value; gAllInfo[MENU_OTHER][OTHER_WIRELESS].str.sjis = s_strEnable[value]; - value = LCFG_TSD_IsFinishedInitialSetting(); - gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].iValue = value; - gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].str.sjis = s_strBool[ value ]; - gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].changable = TRUE; - gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].changeFunc.cBool = LCFG_TSD_SetFlagFinishedInitialSetting; - gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].argType = ARG_BOOL; - gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].kindNameList = s_strBool; - gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].numKindName = 2; + + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].numLines = 2; gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].fromLCFG = TRUE; - - value = LCFG_TSD_IsFinishedInitialSetting_Launcher(); - gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].iValue = value; - gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].str.sjis = s_strBool[ value ]; - gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].changable = TRUE; - gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].changeFunc.cBool = LCFG_TSD_SetFlagFinishedInitialSetting_Launcher; - gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].argType = ARG_BOOL; - gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].kindNameList = s_strBool; - gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].numKindName = 2; + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].numLines = 2; gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].fromLCFG = TRUE; - - value = LCFG_TSD_IsFinishedBrokenTWLSettings(); - gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].iValue = value; - gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].str.sjis = s_strBool[ value ]; - gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].changable = TRUE; - gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].changeFunc.cBool = LCFG_TSD_SetFlagFinishedBrokenTWLSettings; - gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].argType = ARG_BOOL; - gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].kindNameList = s_strBool; - gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].numKindName = 2; + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].numLines = 2; gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].fromLCFG = TRUE; - value = LCFG_TSD_GetInstalledSoftBoxCount(); - gAllInfo[MENU_OTHER][OTHER_LCFG_INSTALLED_SOFTBOX].iValue = value; - gAllInfo[MENU_OTHER][OTHER_LCFG_INSTALLED_SOFTBOX].isNumData = TRUE; gAllInfo[MENU_OTHER][OTHER_LCFG_INSTALLED_SOFTBOX].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_LCFG_INSTALLED_SOFTBOX].numLines = 2; gAllInfo[MENU_OTHER][OTHER_LCFG_INSTALLED_SOFTBOX].fromLCFG = TRUE; - - - value = LCFG_TSD_GetFreeSoftBoxCount(); - gAllInfo[MENU_OTHER][OTHER_LCFG_FREE_SOFTBOX].iValue = value; - gAllInfo[MENU_OTHER][OTHER_LCFG_FREE_SOFTBOX].isNumData = TRUE; + gAllInfo[MENU_OTHER][OTHER_LCFG_FREE_SOFTBOX].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_LCFG_FREE_SOFTBOX].numLines = 2; gAllInfo[MENU_OTHER][OTHER_LCFG_FREE_SOFTBOX].fromLCFG = TRUE; - - value = LCFG_TSD_GetLastTimeBootSoftIndex(); - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_IDX].iValue = value; - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_IDX].isNumData = TRUE; + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_IDX].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_IDX].numLines = 2; gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_IDX].fromLCFG = TRUE; - - value = LCFG_TSD_GetLastTimeBootSoftPlatform(); - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_PLATFORM].iValue = value; - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_PLATFORM].isNumData = TRUE; + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_PLATFORM].isAligned = FALSE; gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_PLATFORM].numLines = 2; gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_PLATFORM].fromLCFG = TRUE; - + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].isAligned = FALSE; + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].numLines = 2; + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].fromLCFG = TRUE; + STD_StrCpy( gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis, "0000" ); + + if( gLCFGAccessible ) { - u64 buf = LCFG_TSD_GetLastTimeBootSoftTitleID(); + + value = LCFG_TSD_IsFinishedInitialSetting(); + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].iValue = value; + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].str.sjis = s_strBool[ value ]; + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].changable = TRUE; + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].changeFunc.cBool = LCFG_TSD_SetFlagFinishedInitialSetting; + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].argType = ARG_BOOL; + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].kindNameList = s_strBool; + gAllInfo[MENU_OTHER][OTHER_INITIAL_SETTINGS].numKindName = 2; + + value = LCFG_TSD_IsFinishedInitialSetting_Launcher(); + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].iValue = value; + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].str.sjis = s_strBool[ value ]; + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].changable = TRUE; + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].changeFunc.cBool = LCFG_TSD_SetFlagFinishedInitialSetting_Launcher; + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].argType = ARG_BOOL; + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].kindNameList = s_strBool; + gAllInfo[MENU_OTHER][OTHER_INITIAL_LAUNCHER].numKindName = 2; + + value = LCFG_TSD_IsFinishedBrokenTWLSettings(); + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].iValue = value; + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].str.sjis = s_strBool[ value ]; + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].changable = TRUE; + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].changeFunc.cBool = LCFG_TSD_SetFlagFinishedBrokenTWLSettings; + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].argType = ARG_BOOL; + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].kindNameList = s_strBool; + gAllInfo[MENU_OTHER][OTHER_BROKEN_SETTINGS].numKindName = 2; + + value = LCFG_TSD_GetInstalledSoftBoxCount(); + gAllInfo[MENU_OTHER][OTHER_LCFG_INSTALLED_SOFTBOX].iValue = value; + gAllInfo[MENU_OTHER][OTHER_LCFG_INSTALLED_SOFTBOX].isNumData = TRUE; + + + value = LCFG_TSD_GetFreeSoftBoxCount(); + gAllInfo[MENU_OTHER][OTHER_LCFG_FREE_SOFTBOX].iValue = value; + gAllInfo[MENU_OTHER][OTHER_LCFG_FREE_SOFTBOX].isNumData = TRUE; + + value = LCFG_TSD_GetLastTimeBootSoftIndex(); + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_IDX].iValue = value; + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_IDX].isNumData = TRUE; + + value = LCFG_TSD_GetLastTimeBootSoftPlatform(); + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_PLATFORM].iValue = value; + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_PLATFORM].isNumData = TRUE; - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].isAligned = FALSE; - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].numLines = 2; - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].fromLCFG = TRUE; - - if( buf ) - // bufが0だったら前回起動したアプリが設定されていない - { - u32 titleID = MI_LoadBE32( &buf ); - - OS_TPrintf("Lastboot ID: %x Title ID: %x\n", buf, titleID ); - MI_CpuCopy( &titleID, gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis, 4 ); - gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis[8] = '\0'; - } - else { - STD_StrCpy( gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis, "N/A" ); + u64 buf = LCFG_TSD_GetLastTimeBootSoftTitleID(); + + + if( buf ) + // bufが0だったら前回起動したアプリが設定されていない + { + u32 titleID = MI_LoadBE32( &buf ); + + OS_TPrintf("Lastboot ID: %x Title ID: %x\n", buf, titleID ); + + MI_CpuCopy( &titleID, gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis, 4 ); + gAllInfo[MENU_OTHER][OTHER_LCFG_LASTBOOT_ID].str.sjis[8] = '\0'; + } } } + + } diff --git a/build/tests/DisplaySystemInformation/ARM9/src/get_sysmenu.c b/build/tests/DisplaySystemInformation/ARM9/src/get_sysmenu.c index dd6f4ff0..91f447ad 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/get_sysmenu.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/get_sysmenu.c @@ -58,9 +58,9 @@ void getSysmenuInfo( void ) { u8 *pBuffer = (u8*) Alloc (NA_VERSION_DATA_WORK_SIZE); - if( !NA_LoadVersionDataArchive( pBuffer, NA_VERSION_DATA_WORK_SIZE ) ) { - return ; - } + // numLineやallinedの設定が必要なのであえてエラーチェックはしない + NA_LoadVersionDataArchive( pBuffer, NA_VERSION_DATA_WORK_SIZE) ; + // バージョンの読み出し { @@ -70,20 +70,23 @@ void getSysmenuInfo( void ) FS_InitFile(&file); - if (!FS_OpenFileEx(&file, FILE_VERSION, FS_FILEMODE_R)) + if ( FS_OpenFileEx(&file, FILE_VERSION, FS_FILEMODE_R)) { - return ; - } - - len = FS_ReadFile(&file, &bufVersion, sizeof(SystemMenuVersion)); - FS_CloseFile(&file); - - gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].iValue = (int)( bufVersion.major << 16 | bufVersion.minor ); - gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].isNumData = TRUE; - - wcsncpy( gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].str.utf, bufVersion.str, TWL_SYSMENU_VER_STR_LEN ); - gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].isSjis = FALSE; - + len = FS_ReadFile(&file, &bufVersion, sizeof(SystemMenuVersion)); + FS_CloseFile(&file); + + gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].iValue = (int)( bufVersion.major << 16 | bufVersion.minor ); + gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].isNumData = TRUE; + + wcsncpy( gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].str.utf, bufVersion.str, TWL_SYSMENU_VER_STR_LEN ); + gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].isSjis = FALSE; + } + else + { + // 成功しなかった場合はデータはN/A + gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].str.sjis = s_strNA; + gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].isSjis = TRUE; + } } // EULA URLの読み出し @@ -93,13 +96,14 @@ void getSysmenuInfo( void ) FS_InitFile(&file); - if (!FS_OpenFileEx(&file, FILE_EULA_URL, FS_FILEMODE_R)) { - return; + if ( FS_OpenFileEx(&file, FILE_EULA_URL, FS_FILEMODE_R)) { + len = FS_ReadFile(&file, gAllInfo[MENU_SYSMENU][SYSMENU_EULA_URL].str.sjis , TWL_EULA_URL_LEN) ; + FS_CloseFile(&file); } - - len = FS_ReadFile(&file, gAllInfo[MENU_SYSMENU][SYSMENU_EULA_URL].str.sjis , TWL_EULA_URL_LEN) ; - FS_CloseFile(&file); - + else + { + STD_StrLCpy( gAllInfo[MENU_SYSMENU][SYSMENU_EULA_URL].str.sjis, s_strNA, TWL_EULA_URL_LEN ); + } } // NUP HOST NAME の読み出し @@ -109,12 +113,14 @@ void getSysmenuInfo( void ) FS_InitFile(&file); - if (!FS_OpenFileEx(&file, FILE_NUP_HOSTNAME, FS_FILEMODE_R)) { - return; - } - - len = FS_ReadFile(&file, gAllInfo[MENU_SYSMENU][SYSMENU_NUP_HOST].str.sjis, TWL_NUP_HOSTNAME_LEN); - FS_CloseFile(&file); + if ( FS_OpenFileEx(&file, FILE_NUP_HOSTNAME, FS_FILEMODE_R)) { + len = FS_ReadFile(&file, gAllInfo[MENU_SYSMENU][SYSMENU_NUP_HOST].str.sjis, TWL_NUP_HOSTNAME_LEN); + FS_CloseFile(&file); + } + else + { + STD_StrLCpy( gAllInfo[MENU_SYSMENU][SYSMENU_NUP_HOST].str.sjis, s_strNA , TWL_NUP_HOSTNAME_LEN ); + } } @@ -125,14 +131,11 @@ void getSysmenuInfo( void ) FS_InitFile(&file); - if (!FS_OpenFileEx(&file, FILE_TIMESTAMP, FS_FILEMODE_R)) { - return ; + if ( FS_OpenFileEx(&file, FILE_TIMESTAMP, FS_FILEMODE_R)) { + len = FS_ReadFile(&file, &gAllInfo[MENU_SYSMENU][SYSMENU_TIMESTAMP].iValue, sizeof(u32) ); + gAllInfo[MENU_SYSMENU][SYSMENU_TIMESTAMP].isNumData = TRUE; + FS_CloseFile(&file); } - - len = FS_ReadFile(&file, &gAllInfo[MENU_SYSMENU][SYSMENU_TIMESTAMP].iValue, sizeof(u32) ); - FS_CloseFile(&file); - - gAllInfo[MENU_SYSMENU][SYSMENU_TIMESTAMP].isNumData = TRUE; } // 署名の照合 @@ -141,7 +144,14 @@ void getSysmenuInfo( void ) u32 fileLen[NUM_FILE_SIGN], maxFileSize = 0; u8 i; u8 *srcBuf, *dstBuf, digestBuf[MATH_SHA1_DIGEST_SIZE], cmpDigestBuf[MATH_SHA1_DIGEST_SIZE]; - + + for( i=0 ; i < NUM_FILE_SIGN; i++ ) + { + // 最初にエントリの行数情報を設定しておく + gAllInfo[MENU_SYSMENU][i + SYSMENU_SIGN_IDX].numLines = 2; + gAllInfo[MENU_SYSMENU][i + SYSMENU_SIGN_IDX].isAligned = FALSE; + } + for( i=0 ; i < NUM_FILE_SIGN; i++ ) { FS_InitFile( &file[i] ); @@ -149,6 +159,7 @@ void getSysmenuInfo( void ) // 署名されたファイルをそれぞれオープン if( !FS_OpenFileEx( &file[i], s_strSignFilePath[i], FS_FILEMODE_R ) ) { + // 開けなかったらNANDアクセス禁止状態なので戻る return ; } @@ -232,5 +243,4 @@ void getSysmenuInfo( void ) } Free(pBuffer); - } \ No newline at end of file diff --git a/build/tests/DisplaySystemInformation/ARM9/src/get_versionData.c b/build/tests/DisplaySystemInformation/ARM9/src/get_versionData.c index 3593ce89..a2131778 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/get_versionData.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/get_versionData.c @@ -18,9 +18,11 @@ void getSharedFontVersion( void ); void getVersions( void ) { - - getWirelessVersion(); +#if NAM_ENABLE getContentsVersion(); +#endif + + getWirelessVersion(); getSharedFontVersion(); } @@ -36,15 +38,21 @@ void getWirelessVersion( void ) FS_InitFile( &file ); NAM_GetTitleBootContentPath( filePath , WL_TITLEID); // 無線ファームのファイルパスを取得 OS_TPrintf("wireless firm path: %s\n", filePath ) ; - res = FS_OpenFileEx( &file, filePath, FS_FILEMODE_R ); - // バージョン情報の読み取り - FS_SeekFile( &file, 0xA0, FS_SEEK_SET ); // ファイルの0xA0から2バイトがバージョン情報 - res = FS_ReadFile( &file, filebuf, 2 ); - SDK_ASSERT( res == 2 ); - - snprintf( gAllInfo[MENU_VERSION][VERSION_WIRELESS].str.sjis, DISPINFO_BUFSIZE-1, "%d.%d", filebuf[0], filebuf[1] ); - gAllInfo[MENU_VERSION][VERSION_WIRELESS].iValue = filebuf[0] *100 + filebuf[1]; + if( FS_OpenFileEx( &file, filePath, FS_FILEMODE_R ) ) + { + // バージョン情報の読み取り + FS_SeekFile( &file, 0xA0, FS_SEEK_SET ); // ファイルの0xA0から2バイトがバージョン情報 + res = FS_ReadFile( &file, filebuf, 2 ); + SDK_ASSERT( res == 2 ); + + snprintf( gAllInfo[MENU_VERSION][VERSION_WIRELESS].str.sjis, DISPINFO_BUFSIZE-1, "%d.%d", filebuf[0], filebuf[1] ); + gAllInfo[MENU_VERSION][VERSION_WIRELESS].iValue = filebuf[0] *100 + filebuf[1]; + } + else + { + snprintf( gAllInfo[MENU_VERSION][VERSION_WIRELESS].str.sjis, DISPINFO_BUFSIZE-1, s_strNA ); + } } @@ -66,6 +74,13 @@ void getContentsVersion( void ) int i; gNumContents = NAM_GetNumTitles(); + + if( gNumContents < 0 ) + { + // NAMが駄目だとか、NANDアクセスできないだとかの場合は終了 + return ; + } + OS_TPrintf(" numContents: %d\n", gNumContents); if( gContentsTitle == NULL ) diff --git a/build/tests/DisplaySystemInformation/ARM9/src/main.c b/build/tests/DisplaySystemInformation/ARM9/src/main.c index 7d87ccd1..38e0a633 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/main.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/main.c @@ -85,8 +85,10 @@ void TwlMain( void ) InitAllocator(); CRYPTO_SetAllocator( Alloc, Free ); +#if NAM_ENABLE OS_TPrintf("NAM Initialize...\n"); NAM_Init( Alloc, Free ); +#endif InitBG(); OS_TPrintf("Initialize Finished\n"); diff --git a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c index c2cdabac..ee770bca 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c +++ b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c @@ -47,6 +47,8 @@ u16 *gContentsVersion; // gContentsTitle u8 gArm7SCFGReg[DISPINFO_SHARED_SCFG_REG_SIZE]; u8 gArm7SCFGShared[DISPINFO_SHARED_SCFG_WRAM_SIZE]; +// LCFGReadの結果 +BOOL gLCFGAccessible; /* static data ---------------------------------- */ @@ -177,7 +179,7 @@ void displayInfoInit( void ) GX_DispOff(); GXS_DispOff(); NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_WHITE ); - + OS_TPrintf(" size version: %d\n", s_numMenu[MENU_VERSION]); // 全体情報を持つ配列をセット // 可能なものは用意したstatic文字列へのポインタで対応 // 必要なものだけあとでmallocする @@ -208,11 +210,13 @@ void displayInfoInit( void ) // LCFGデータの読み出し bufLCFG = (u8*) Alloc ( LCFG_READ_TEMP ); SDK_ASSERT( bufLCFG ); - LCFG_ReadTWLSettings( (u8 (*)[ LCFG_READ_TEMP ]) bufLCFG ); + gLCFGAccessible = LCFG_ReadTWLSettings( (u8 (*)[ LCFG_READ_TEMP ]) bufLCFG ); + GXS_SetVisiblePlane( GX_PLANEMASK_BG0 ); GX_DispOn(); GXS_DispOn(); + OS_TPrintf(" size version: %d\n", s_numMenu[MENU_VERSION]); } void printAllInfo ( void ) diff --git a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.h b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.h index 605fd1bd..afa2f696 100644 --- a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.h +++ b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.h @@ -78,6 +78,8 @@ extern DispInfoEntry* gAllInfo[ROOTMENU_SIZE]; extern u8 gArm7SCFGReg[DISPINFO_SHARED_SCFG_REG_SIZE]; // ARM7からのデータ取得用バッファ extern u8 gArm7SCFGShared[DISPINFO_SHARED_SCFG_WRAM_SIZE]; // ARM7からのデータ取得用バッファ +extern BOOL gLCFGAccessible; + //////////////////////////////// void displayInfoMain( void );