From 086b9d82d4152b9a2116d62556c2fa4c4b3aad27 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Fri, 23 May 2008 12:33:16 +0000 Subject: [PATCH] =?UTF-8?q?SDK=E3=81=AEarmadillo.SYSMENU=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=81=AB=E4=BC=B4=E3=81=84=E3=80=81libraries/sysmenu=E3=81=A8a?= =?UTF-8?q?rmadillo=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82=20HW=E3=83=8E?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=AB=E6=83=85=E5=A0=B1=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=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@1505 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/components/Makefile | 3 +- build/components/armadillo2.TWL/Makefile | 84 ------------------ .../components/armadillo2.TWL/armadillo2.lsf | 85 ------------------- build/libraries_sysmenu/Makefile | 3 +- build/libraries_sysmenu/pm/ARM7/Makefile | 74 ---------------- build/libraries_sysmenu/pm/Makefile | 33 ------- .../MachineSettings/ARM9/Makefile | 2 +- build/tests/CheckPreloadParameters/src/main.c | 9 +- 8 files changed, 7 insertions(+), 286 deletions(-) delete mode 100644 build/components/armadillo2.TWL/Makefile delete mode 100644 build/components/armadillo2.TWL/armadillo2.lsf delete mode 100644 build/libraries_sysmenu/pm/ARM7/Makefile delete mode 100644 build/libraries_sysmenu/pm/Makefile diff --git a/build/components/Makefile b/build/components/Makefile index e488da4d..bfd7acf1 100644 --- a/build/components/Makefile +++ b/build/components/Makefile @@ -22,8 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- SUBDIRS = \ - hyena.TWL \ - armadillo2.TWL + hyena.TWL #---------------------------------------------------------------------------- diff --git a/build/components/armadillo2.TWL/Makefile b/build/components/armadillo2.TWL/Makefile deleted file mode 100644 index feee0510..00000000 --- a/build/components/armadillo2.TWL/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -#! make -f -#---------------------------------------------------------------------------- -# Project: TwlSDK - components - armadillo.TWL -# File: Makefile -# -# Copyright 2008 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 -override TARGET_PLATFORM = TWL -override TWL_PROC = ARM7 -override TWL_ARCHGEN = LIMITED -override TWL_PLATFORM = TS -TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ALL - -#---------------------------------------------------------------------------- - -COMPONENT_DIR = $(ROOT)/build/components/armadillo.TWL -SRCDIR = $(COMPONENT_DIR)/src -SRCS = main.c overwriteRtc.c - -TARGET_NAME = armadillo2 - -TARGET_NEF = $(TARGET_NAME).tef -LCFILE_SPEC = armadillo2.lsf -LCFILE_TEMPLATE = $(COMPONENT_DIR)/armadillo.lcf.template -LDRES_TEMPLATE = $(COMPONENT_DIR)/armadillo.response.template - -CRT0_O = crt0.SCR.TWL.o - -# スタック不足防止の為、インライン展開せずにコンパイルする -CCFLAGS_OPT = -O4 -inline off - -#---------------------------------------------------------------------------- -include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs - -MACRO_FLAGS += -DSDK_ARM7COMP_LTD -DSDK_SEA - -MAKELCF_FLAGS += -DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libstubsistd_sp$(TWL_LIBSUFFIX).a)' \ - -DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a' - -#-------------------------------- -# install target -#-------------------------------- -INSTALL_TARGETS = $(BINDIR)/$(TARGET_NAME).tef \ - $(BINDIR)/$(TARGET_NAME).TWL.FLX.sbin \ - $(BINDIR)/$(TARGET_NAME)_defs.TWL.FLX.sbin \ - $(BINDIR)/$(TARGET_NAME).TWL.LTD.sbin \ - $(BINDIR)/$(TARGET_NAME)_defs.TWL.LTD.sbin - -INSTALL_DIR = $(TWL_INSTALL_COMPONENTSDIR)/$(TARGET_NAME)/$(TWL_BUILDTYPE) - -LINCLUDES = $(ROOT)/build/libraries/spi/ARM7/include - -LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \ - libsdio_sp$(TWL_LIBSUFFIX).a \ - libathdrv_sp$(TWL_LIBSUFFIX).a \ - libwpa_sp$(TWL_LIBSUFFIX).a \ - libsea_sp$(TWL_LIBSUFFIX).a \ - -LLIBRARIES += libpm_mset_sp$(TWL_LIBSUFFIX).a -GLIBRARIES := $(filter-out libpm_sp$(TWL_LIBSUFFIX).a,$(GLIBRARIES)) - -LDEPENDS_NEF = $(TWL_LIBS) $(LLIBRARIES) - -do-build: $(TARGETS) - -#---------------------------------------------------------------------------- -include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules - -#---------------------------------------------------------------------------- - -#===== End of Makefile ===== diff --git a/build/components/armadillo2.TWL/armadillo2.lsf b/build/components/armadillo2.TWL/armadillo2.lsf deleted file mode 100644 index 98ba2522..00000000 --- a/build/components/armadillo2.TWL/armadillo2.lsf +++ /dev/null @@ -1,85 +0,0 @@ -#---------------------------------------------------------------------------- -# Project: TwlSDK - components - armadillo.TWL -# File: armadillo.lsf -# -# Copyright 2008 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$ -#---------------------------------------------------------------------------- -# -# Nitro LCF SPEC FILE -# -#-------- -Static $(TARGET_NAME) -{ - Address 0x02380000 - StackSize 1024 1024 - - Library $(CRT0_O) -} - -#-------- -Ltdautoload SCRWRAM -{ - Address 0x03740000 - - Library libsubpsyscall.a - Library libsyscall_sp.twl.a - Library $(CW_LIBS) - Library $(ISDBG_LIBS_TWL) - Library $(ISDBG_LIBS_NITRO) - - Object * (.etable) - Object $(OBJDIR)/main.o - Object $(OBJDIR)/overwriteRtc.o - - Library libsea_sp$(LIBSUFFIX).a - Library libcrypto_sp$(LIBSUFFIX).a - - Library libos_sp$(LIBSUFFIX).a - Library libmi_sp$(LIBSUFFIX).a - Library libstd_sp$(LIBSUFFIX).a - Library libmath_sp$(LIBSUFFIX).a - Library libpxi_sp$(LIBSUFFIX).a - Library libexi_sp$(LIBSUFFIX).a - Library libi2c_sp$(LIBSUFFIX).a - Library libsdio_sp$(LIBSUFFIX).a - Library libpad_sp$(LIBSUFFIX).a - Library libscfg_sp$(LIBSUFFIX).a - Library libmcu_sp$(LIBSUFFIX).a - Library libcdc_sp$(LIBSUFFIX).a - Library libsnd_sp$(LIBSUFFIX).a - Library libsndex_sp$(LIBSUFFIX).a - Library libspi_sp$(LIBSUFFIX).a - Library libpm_mset_sp$(LIBSUFFIX).a - Library libtp_sp$(LIBSUFFIX).a - Library libtpex_sp$(LIBSUFFIX).a - Library libmic_sp$(LIBSUFFIX).a - Library libmicex_sp$(LIBSUFFIX).a - Library libnvram_sp$(LIBSUFFIX).a - Library librtc_sp$(LIBSUFFIX).a - Library libfatfs_sp$(LIBSUFFIX).a - Library libwm_sp$(LIBSUFFIX).a - Library libnwm_sp$(LIBSUFFIX).a - Library libwvr_sp$(LIBSUFFIX).a - Library libwl_sp$(LIBSUFFIX).a - Library libwpa_sp$(LIBSUFFIX).a - Library libathdrv_sp$(LIBSUFFIX).a -# Library libfs_sp$(LIBSUFFIX).a -# Library libcard_sp$(LIBSUFFIX).a -# Library libcamera_sp$(LIBSUFFIX).a - - Object * (.wram) - Object * (.ltdwram) - Object * (.rsvwram) - Object * (.main) - Object * (.ltdmain) -} diff --git a/build/libraries_sysmenu/Makefile b/build/libraries_sysmenu/Makefile index 931b0187..f875ad41 100644 --- a/build/libraries_sysmenu/Makefile +++ b/build/libraries_sysmenu/Makefile @@ -34,8 +34,7 @@ SUBDIRS = reloc_info \ banner \ util \ dht \ - wds \ - pm + wds #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/pm/ARM7/Makefile b/build/libraries_sysmenu/pm/ARM7/Makefile deleted file mode 100644 index d2c0b0b5..00000000 --- a/build/libraries_sysmenu/pm/ARM7/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -#! make -f -#---------------------------------------------------------------------------- -# Project: TwlIPL -# File: Makefile -# -# Copyright 2007 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$ -#---------------------------------------------------------------------------- - -SUBDIRS = - -#---------------------------------------------------------------------------- -TARGET_FIRM = SYSTEMMENU -TARGET_PLATFORM = TWL -TWL_CODEGEN ?= ALL -TWL_ARCHGEN = LIMITED -TWL_PROC = ARM7 - -SRCDIR = $(ROOT)/build/libraries/spi/ARM7/pm/src \ - $(ROOT)/build/libraries/spi/ARM7.TWL/pm/src -INCDIR = $(ROOT)/build/libraries/spi/ARM7/include \ - $(ROOT)/build/libraries/spi/ARM7/pm/include \ - $(ROOT)/build/libraries/spi/ARM7.TWL/pm/include - -SRCS = pm_sp.c \ - pm_send.c \ - pm_pmic.c \ - pm_utility.c \ - pm_sleep.c \ - pm_selfBlink.c \ - pm_shutdown.c - - -TARGET_LIB = libpm_mset_sp$(TWL_LIBSUFFIX).a - -MACRO_FLAGS += -DSDK_SYSMENU_BUILD - -#---------------------------------------------------------------------------- - -# DEBUG版ビルドの場合、RELEASE版でビルドして -# DEBUG版のライブラリを装います。 - -ifdef TARGET_DEBUG -TWL_BUILD_TYPE = RELEASE -else -ifdef TWL_DEBUG -TWL_BUILD_TYPE = RELEASE -else -ifdef NITRO_DEBUG -TWL_BUILD_TYPE = RELEASE -endif -endif -endif - - -include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs - -INSTALL_TARGETS = $(TARGETS) -INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) - -#---------------------------------------------------------------------------- - -do-build: $(TARGETS) - -include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules diff --git a/build/libraries_sysmenu/pm/Makefile b/build/libraries_sysmenu/pm/Makefile deleted file mode 100644 index cfc959ae..00000000 --- a/build/libraries_sysmenu/pm/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -#! make -f -#---------------------------------------------------------------------------- -# Project: TwlIPL -# File: Makefile -# -# Copyright 2007 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 - -include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs - - -#---------------------------------------------------------------------------- - -SUBDIRS = ARM7 - -#---------------------------------------------------------------------------- - -include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules - - -#===== End of Makefile ===== diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index e48ae424..4fdbfb58 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -100,7 +100,7 @@ ifeq ($(ENABLE_AES),TRUE) MAKEROM_FLAGS += -a endif -MAKEROM_ARM7_BASE = $(TWL_COMPONENTSDIR)/armadillo2/$(TWL_BUILDTYPE_ARM7)/armadillo2 +MAKEROM_ARM7_BASE = $(TWL_COMPONENTSDIR)/armadillo_SYSMENU/$(TWL_BUILDTYPE_ARM7)/armadillo_SYSMENU MAKEROM_ARM7 = $(MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe diff --git a/build/tests/CheckPreloadParameters/src/main.c b/build/tests/CheckPreloadParameters/src/main.c index 63bd5d3d..67ed5f69 100644 --- a/build/tests/CheckPreloadParameters/src/main.c +++ b/build/tests/CheckPreloadParameters/src/main.c @@ -20,7 +20,6 @@ void VBlankIntr(void); OSOwnerInfoEx s_owner; -u8 s_cameraInfo[ OS_TWL_HWINFO_CAMERA_LEN ]; static char *s_strCountry[ 256 ]; static char *s_strRegion[ OS_TWL_REGION_MAX ]; static char *s_strUserColor[ OS_FAVORITE_COLOR_MAX ]; @@ -97,13 +96,13 @@ void TwlMain(void) { int i; - OS_TPrintf( "CameraInfo :" ); - OS_GetCameraInfo( s_cameraInfo ); - for( i = 0; i < OS_TWL_HWINFO_CAMERA_LEN; i++ ) { + const u8 *p = OS_GetMovableUniqueIDPtr(); + OS_TPrintf( "MovableUniqueID :" ); + for( i = 0; i < OS_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN; i++ ) { if( ( i & 0x0f ) == 0 ) { OS_TPrintf( "\n" ); } - OS_TPrintf( " %02x,", s_cameraInfo[ i ] ); + OS_TPrintf( " %02x,", *p++ ); } OS_TPrintf( "\n" ); }