・UTLライブラリにPMライブラリ改を用いたバックライト輝度調整・取得関数を追加。

u32 UTL_SetBacklightBrightness( u8 brightness )
　u32 UTL_GetBacklightBrightness( u8 *pBrightness )
・hyenaコンポーネントをPMライブラリ改を使用するよう変更。
・PMライブラリ改を使用するarmadillo2コンポーネントを追加。
・本体設定をarmadillo2コンポーネント使用に変更。

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

build/components/Makefile

@@ -22,7 +22,8 @@ include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 #----------------------------------------------------------------------------
 
 SUBDIRS =	\
-			hyena.TWL
+			hyena.TWL \
+			armadillo2.TWL
 
 #----------------------------------------------------------------------------
 

build/components/armadillo2.TWL/Makefile

@@ -0,0 +1,84 @@
+#! 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 =====

build/components/armadillo2.TWL/armadillo2.lsf

@@ -0,0 +1,85 @@
+#----------------------------------------------------------------------------
+# 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)
+}

build/components/hyena.TWL/Makefile

@@ -48,7 +48,8 @@ CCFLAGS_OPT		=	-O4 -inline off
 #----------------------------------------------------------------------------
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
-GLIBRARIES		:= $(filter-out $(CRT0_O),$(GLIBRARIES))
+# crt0.o と libpm_sp は、ローカルでビルドしたものを使用するので、除外する。
+GLIBRARIES		:= $(filter-out $(CRT0_O) libpm_sp$(TWL_LIBSUFFIX).a,$(GLIBRARIES))
 
 ifdef TWLSDK_NOCRYPTO
 CCFLAGS			+=	-DSDK_NOCRYPTO
@@ -101,6 +102,7 @@ SYSMENU_LIBS	=	\
 					libds_sp$(TWL_LIBSUFFIX).a \
 					libhotsw_sp$(TWL_LIBSUFFIX).a \
 					libdht_sp$(TWL_LIBSUFFIX).a \
+					libpm_mset_sp$(TWL_LIBSUFFIX).a
 
 SDK_APPEND_LIBS	=	\
 					libwl_sp.TWL.LTD.a \

build/components/hyena.TWL/hyena.lsf

@@ -42,7 +42,7 @@ Autoload WRAM
 				libexi_sp$(LIBSUFFIX).a		\
 				libsnd_sp$(LIBSUFFIX).a		\
 				libspi_sp$(LIBSUFFIX).a		\
-				libpm_sp$(LIBSUFFIX).a		\
+				libpm_mset_sp$(LIBSUFFIX).a		\
 				libmath_sp$(LIBSUFFIX).a		\
 				libscfg_sp$(LIBSUFFIX).a		\
 				libtp_sp$(LIBSUFFIX).a		\

build/libraries_sysmenu/sharedFont/ARM9/Makefile

@@ -38,8 +38,6 @@ MACRO_FLAGS		+=	-DUSE_FONT_WRAM_LOAD
 INSTALL_TARGETS	=	$(TARGETS)
 INSTALL_DIR		=	$(SYSMENU_INSTALL_LIBDIR)
 
-LDIRT_CLEAN		=	$(REVISION_SRC)
-
 #----------------------------------------------------------------------------
 
 do-build: $(TARGETS)

build/libraries_sysmenu/sysmenu/ARM9/src/device.c

@@ -83,9 +83,9 @@ u8 SYSM_GetBackLightBlightness( void )
 // バックライト輝度調整
 void SYSM_SetBackLightBrightness( u8 brightness )
 {
-	if( brightness > LCFG_TWL_BACKLIGHT_LEVEL_MAX ) {
+	if( brightness > BACKLIGHT_BRIGHTNESS_MAX ) {
-		OS_TPrintf( "Backlight brightness over! Change brightenss forcibly : %d -> %d\n", brightness, LCFG_TWL_BACKLIGHT_LEVEL_MAX );
+		OS_TPrintf( "Backlight brightness over! Change brightenss forcibly : %d -> %d\n", brightness, BACKLIGHT_BRIGHTNESS_MAX );
-		brightness = LCFG_TWL_BACKLIGHT_LEVEL_MAX;
+		brightness = BACKLIGHT_BRIGHTNESS_MAX;
 	}
 #ifdef SDK_SUPPORT_PMIC_2
 	if ( SYSMi_GetMcuVersion() <= 1 )

build/libraries_sysmenu/util/ARM9/src/device.c

@@ -83,9 +83,9 @@ u8 SYSM_GetBackLightBlightness( void )
 // バックライト輝度調整
 void SYSM_SetBackLightBrightness( u8 brightness )
 {
-	if( brightness > LCFG_TWL_BACKLIGHT_LEVEL_MAX ) {
+	if( brightness > BACKLIGHT_BRIGHTNESS_MAX ) {
-		OS_TPrintf( "Backlight brightness over! Change brightenss forcibly : %d -> %d\n", brightness, LCFG_TWL_BACKLIGHT_LEVEL_MAX );
+		OS_TPrintf( "Backlight brightness over! Change brightenss forcibly : %d -> %d\n", brightness, BACKLIGHT_BRIGHTNESS_MAX );
-		brightness = LCFG_TWL_BACKLIGHT_LEVEL_MAX;
+		brightness = BACKLIGHT_BRIGHTNESS_MAX;
 	}
 #ifdef SDK_SUPPORT_PMIC_2
 	if ( SYSMi_GetMcuVersion() <= 1 )

build/libraries_sysmenu/util/ARM9/src/util.c

@@ -28,6 +28,36 @@ static s64 UTLi_CalcRTCSecOffset( RTCDate *datep, RTCTime *timep );
 // const data  -----------------------------------------
 // function's description-------------------------------
 
+
+//======================================================================
+//  バックライト
+//======================================================================
+
+// バックライト輝度セット
+u32 UTL_SetBacklightBrightness( u8 brightness )
+{
+	brightness %= ( BACKLIGHT_BRIGHTNESS_MAX + 1 );
+	return PM_SendUtilityCommand( PMi_UTIL_SET_BACKLIGHT_BRIGHTNESS, (u16)brightness, NULL );
+}
+
+
+// バックライト輝度
+u32 UTL_GetBacklightBrightness( u8 *pBrightness )
+{
+	u16 status;
+	u32 result = PM_SendUtilityCommand( PM_UTIL_GET_STATUS, PMi_UTIL_GET_BACKLIGHT_BRIGHTNESS, &status);
+
+	if ( result == PM_RESULT_SUCCESS )
+	{
+		if (pBrightness)
+		{
+			*pBrightness = (u8)status;
+		}
+	}
+	return result;
+}
+
+
 //======================================================================
 //  タッチパネル
 //======================================================================

build/systemMenu_RED/Launcher/ARM9/src/launcher.c

@@ -516,7 +516,7 @@ static void ProcessBackLightPads( void )
 	static BOOL dw_bl_bak = FALSE;
 	BOOL up_bl_trg = FALSE;
 	BOOL dw_bl_trg = FALSE;
-	int brightness;
+	u8 brightness = 0;
 	
 	if(tpd.disp.touch) {
 		BOOL up_bl = WithinRangeTP(	B_LIGHT_UP_BUTTON_TOP_X,    B_LIGHT_UP_BUTTON_TOP_Y,
@@ -533,18 +533,18 @@ static void ProcessBackLightPads( void )
 	}
 	
 	if( (pad.trg & PAD_KEY_UP) || up_bl_trg ) {
-		brightness = SYSM_GetBackLightBlightness() + 1;
+		(void)UTL_GetBacklightBrightness( &brightness );
-		if( brightness > LCFG_TWL_BACKLIGHT_LEVEL_MAX ) {
+		if( ++brightness > BACKLIGHT_BRIGHTNESS_MAX ) {
-			brightness = LCFG_TWL_BACKLIGHT_LEVEL_MAX;
+			brightness = BACKLIGHT_BRIGHTNESS_MAX;
 		}
-		SYSM_SetBackLightBrightness( (u8)brightness );
+		(void)UTL_SetBacklightBrightness( brightness );
 	}
 	if( ( pad.trg & PAD_KEY_DOWN) || dw_bl_trg ) {
-		brightness = SYSM_GetBackLightBlightness() - 1;
+		(void)UTL_GetBacklightBrightness( &brightness );
-		if( brightness < 0 ) {
+		if( --brightness < 0 ) {
 			brightness = 0;
 		}
-		SYSM_SetBackLightBrightness( (u8)brightness );
+		(void)UTL_SetBacklightBrightness( brightness );
 	}
 }
 

build/systemMenu_RED/Launcher/ARM9/src/main.c

@@ -26,7 +26,7 @@
 // extern data-----------------------------------------------------------------
 
 // define data-----------------------------------------------------------------
-
+#define DISABLE_WLFIRM_LOAD
 // function's prototype-------------------------------------------------------
 static void INTR_VBlank( void );
 static void deleteTmp();

build/systemMenu_RED/MachineSettings/ARM9/Makefile

@@ -100,7 +100,7 @@ ifeq ($(ENABLE_AES),TRUE)
 MAKEROM_FLAGS += -a
 endif
 
-MAKEROM_ARM7_BASE		=	$(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
+MAKEROM_ARM7_BASE		=	$(TWL_COMPONENTSDIR)/armadillo2/$(TWL_BUILDTYPE_ARM7)/armadillo2
 MAKEROM_ARM7			=	$(MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
 MAKEROM					=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe