Makefileによるビルドスイッチで、システム/ユーザ、NAND/Gamecard、SCFGLock/Unlockの条件分岐によって8種類の実行ファイルを生成するようにした。

最初にLCFGReadTWLSettingでデータ取得に失敗した場合、LCFG経由で取得するデータは全て明示的にN/Aと表示するようにした。

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

build/tests/DisplaySystemInformation/ARM9/Makefile

@@ -17,8 +17,9 @@
 #----------------------------------------------------------------------------
 
 SUBDIRS					=	
-#SUBMAKES		=	Makefile.racoon_SCFG Makefile.racoon_noSCFG Makefile.armadillo
+SUBMAKES		=	Makefile.0 Makefile.1 Makefile.2 Makefile.3\
-SUBMAKES		=	Makefile.armadillo
+				Makefile.4 Makefile.5 Makefile.6 Makefile.7
+
 include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs
 
 #----------------------------------------------------------------------------

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
+IS_NAND_APP		=	TRUE
-ROM_SPEC		=	main_$(DEFAULT_COMP_ARM7).rsf
-BINDIR			= 	./bin/$(TWL_BUILDTYPE)/armadillo
 
+# 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)
 

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
+IS_SECURE_APP		=	TRUE
-ROM_SPEC		=	main_racoon_SCFG.rsf
+
-BINDIR			= ./bin/$(TWL_BUILDTYPE)/racoon_SCFG
+# なんどアプリかどうか
+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)

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
+IS_SECURE_APP		=	TRUE
-ROM_SPEC		=	main_racoon_noSCFG.rsf
+
-BINDIR			= 	./bin/$(TWL_BUILDTYPE)/racoon_noSCFG
+# なんどアプリかどうか
+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)

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 =====

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 =====

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 =====

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 =====

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 =====

build/tests/DisplaySystemInformation/ARM9/main.rsf

@@ -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
-
-}

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]

build/tests/DisplaySystemInformation/ARM9/main_racoon.rsf

@@ -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
-
-}

build/tests/DisplaySystemInformation/ARM9/main_racoon_noSCFG.rsf

@@ -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
-
-}

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

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;
 	}

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].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;	
 	}
+	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;
 
 }

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';
+			}
 		}
 	}
+	
+	
 }

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 ) ) {
+	// numLineやallinedの設定が必要なのであえてエラーチェックはしない
-		return ;
+	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);
-		
+			        
-        len = FS_ReadFile(&file, &bufVersion, sizeof(SystemMenuVersion));
+	        gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].iValue = (int)( bufVersion.major << 16 | bufVersion.minor );
-        FS_CloseFile(&file);
+	        gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].isNumData = TRUE;
-		        
+	        
-        gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].iValue = (int)( bufVersion.major << 16 | bufVersion.minor );
+			wcsncpy( gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].str.utf, bufVersion.str, TWL_SYSMENU_VER_STR_LEN );
-        gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_NUM].isNumData = TRUE;
+			gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].isSjis = FALSE;
-        
+		}
-		wcsncpy( gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].str.utf, bufVersion.str, TWL_SYSMENU_VER_STR_LEN );
+		else
-		gAllInfo[MENU_SYSMENU][SYSMENU_VERSION_STR].isSjis = FALSE;
+		{
-		
+			// 成功しなかった場合はデータは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)) {
+        if ( FS_OpenFileEx(&file, FILE_EULA_URL, FS_FILEMODE_R)) {
-            return;
+	        len = FS_ReadFile(&file, gAllInfo[MENU_SYSMENU][SYSMENU_EULA_URL].str.sjis , TWL_EULA_URL_LEN) ;
+	        FS_CloseFile(&file);
         }
-		
+		else
-        len = FS_ReadFile(&file, gAllInfo[MENU_SYSMENU][SYSMENU_EULA_URL].str.sjis , TWL_EULA_URL_LEN) ;
+		{
-        FS_CloseFile(&file);
+			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)) {
+        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);
-		
+		}
-        len = FS_ReadFile(&file, gAllInfo[MENU_SYSMENU][SYSMENU_NUP_HOST].str.sjis, TWL_NUP_HOSTNAME_LEN);
+		else
-        FS_CloseFile(&file);
+		{
+			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)) {
+        if ( FS_OpenFileEx(&file, FILE_TIMESTAMP, FS_FILEMODE_R)) {
-            return ;
+	        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);
-
 }

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

@@ -18,9 +18,11 @@ void getSharedFontVersion( void );
 
 void getVersions( void )
 {
-	
+#if NAM_ENABLE
-	getWirelessVersion();
 	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 );
 	
-	// バージョン情報の読み取り
+	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 );
+		FS_SeekFile( &file, 0xA0, FS_SEEK_SET ); // ファイルの0xA0から2バイトがバージョン情報
-	
+		res = FS_ReadFile( &file, filebuf, 2 );
-	snprintf( gAllInfo[MENU_VERSION][VERSION_WIRELESS].str.sjis, DISPINFO_BUFSIZE-1, "%d.%d", filebuf[0], filebuf[1] );
+		SDK_ASSERT( res == 2 );
-	gAllInfo[MENU_VERSION][VERSION_WIRELESS].iValue = filebuf[0] *100 + filebuf[1];
+		
+		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 )

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");

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 )

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 );