From a86fac4a8ca371a41d9f44abd2db1201c629951e Mon Sep 17 00:00:00 2001 From: yutaka Date: Mon, 14 Apr 2008 04:43:00 +0000 Subject: [PATCH] =?UTF-8?q?PMIC=5FFINAL=20=3D>=20SDK=5FTS=5FVERSION=20mcu?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=AE=E3=82=B3=E3=83=BC=E3=83=89=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= 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@1119 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/gcdfirm/gcdfirm-disp/ARM7/main.c | 2 +- build/gcdfirm/sdmc-launcher/ARM7/main.c | 2 +- build/nandfirm/menu-launcher/ARM7/main.c | 30 ++++------------------ build/nandfirm/sdmc-launcher/ARM7/main.c | 32 +++++------------------- 4 files changed, 13 insertions(+), 53 deletions(-) diff --git a/build/gcdfirm/gcdfirm-disp/ARM7/main.c b/build/gcdfirm/gcdfirm-disp/ARM7/main.c index ae61abf7..e76df595 100644 --- a/build/gcdfirm/gcdfirm-disp/ARM7/main.c +++ b/build/gcdfirm/gcdfirm-disp/ARM7/main.c @@ -41,7 +41,7 @@ void TwlSpMain( void ) OS_EnableIrq(); PM_InitFIRM(); -#ifndef PMIC_FINAL +#if SDK_TS_VERSION < 300 PMi_SetParams( REG_PMIC_BL_BRT_A_ADDR, PMIC_BACKLIGHT_BRIGHT_DEFAULT, PMIC_BL_BRT_A_MASK ); PMi_SetParams( REG_PMIC_BL_BRT_B_ADDR, PMIC_BACKLIGHT_BRIGHT_DEFAULT, PMIC_BL_BRT_B_MASK ); #else diff --git a/build/gcdfirm/sdmc-launcher/ARM7/main.c b/build/gcdfirm/sdmc-launcher/ARM7/main.c index 98835880..0df7d14c 100644 --- a/build/gcdfirm/sdmc-launcher/ARM7/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM7/main.c @@ -310,7 +310,7 @@ void TwlSpMain( void ) #endif SetDebugLED( 0 ); -#ifndef PMIC_FINAL +#if SDK_TS_VERSION < 300 PMi_SetParams( REG_PMIC_BL_BRT_B_ADDR, 22, PMIC_BL_BRT_B_MASK ); #else MCUi_WriteRegister( MCU_REG_BL_ADDR, MCU_REG_BL_BRIGHTNESS_MASK ); diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c index de68498c..f3d5fda1 100644 --- a/build/nandfirm/menu-launcher/ARM7/main.c +++ b/build/nandfirm/menu-launcher/ARM7/main.c @@ -84,15 +84,6 @@ static void CreateIdleThread(void) OS_WakeupThreadDirect(&idleThread); } -// MCU旧バージョン対策 -#if SDK_TS_VERSION <= 200 -static u8 version = 0; -#define IS_OLD_MCU (version ? (version < 0x20) : ((version=MCUi_ReadRegister( MCU_REG_VER_INFO_ADDR )) < 0x20)) -#else -#define IS_OLD_MCU FALSE -#define MCU_OLD_REG_TEMP_ADDR MCU_REG_TEMP_ADDR // avoid compiler error -#endif - /*************************************************************** PreInit @@ -101,20 +92,6 @@ static u8 version = 0; ***************************************************************/ static void PreInit(void) { - /* - バッテリー残量チェック - */ - if ( !IS_OLD_MCU ) // MCU旧バージョン対策 - { - if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 ) - { -#ifndef SDK_FINALROM - OS_TPanic("Battery is empty.\n"); -#else - PM_Shutdown(); -#endif - } - } /* FromBrom関連 */ @@ -126,11 +103,13 @@ static void PreInit(void) リセットパラメータ(1バイト)を共有領域(1バイト)にコピー */ #define HOTSTART_FLAG_ENABLE 0x80 - if ( IS_OLD_MCU ) // MCU旧バージョン対策 +#if SDK_TS_VERSION <= 200 + if ( MCU_GetVerInfo() < 0x20 ) // MCU旧バージョン対策 { *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCUi_ReadRegister( (u16)(MCU_OLD_REG_TEMP_ADDR + OS_MCU_RESET_VALUE_OFS) ) | HOTSTART_FLAG_ENABLE); } else +#endif { *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCUi_ReadRegister( (u16)(MCU_REG_TEMP_ADDR + OS_MCU_RESET_VALUE_OFS) ) | HOTSTART_FLAG_ENABLE); } @@ -163,7 +142,8 @@ static void PostInit(void) /* バッテリー残量チェック */ - if ( !IS_OLD_MCU ) // MCU旧バージョン対策 + MCUi_WriteRegister( MCU_REG_MODE_ADDR, MCU_SYSTEMMODE_FIRMWARE ); // change battery level only + if ( MCU_GetVerInfo() >= 0x20 ) // MCU旧バージョン対策 { if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 ) { diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c index 2dc90e9b..8f7ec4a0 100644 --- a/build/nandfirm/sdmc-launcher/ARM7/main.c +++ b/build/nandfirm/sdmc-launcher/ARM7/main.c @@ -84,15 +84,6 @@ static void CreateIdleThread(void) OS_WakeupThreadDirect(&idleThread); } -// MCU旧バージョン対策 -#if SDK_TS_VERSION <= 200 -static u8 version = 0; -#define IS_OLD_MCU (version ? (version < 0x20) : ((version=MCUi_ReadRegister( MCU_REG_VER_INFO_ADDR )) < 0x20)) -#else -#define IS_OLD_MCU FALSE -#define MCU_OLD_REG_TEMP_ADDR MCU_REG_TEMP_ADDR // avoid compiler error -#endif - /*************************************************************** PreInit @@ -101,20 +92,6 @@ static u8 version = 0; ***************************************************************/ static void PreInit(void) { - /* - バッテリー残量チェック - */ - if ( !IS_OLD_MCU ) // MCU旧バージョン対策 - { - if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 ) - { -#ifndef SDK_FINALROM - OS_TPanic("Battery is empty.\n"); -#else - PM_Shutdown(); -#endif - } - } /* FromBrom関連 */ @@ -126,11 +103,13 @@ static void PreInit(void) リセットパラメータ(1バイト)を共有領域(1バイト)にコピー */ #define HOTSTART_FLAG_ENABLE 0x80 - if ( IS_OLD_MCU ) // MCU旧バージョン対策 +#if SDK_TS_VERSION <= 200 + if ( MCU_GetVerInfo() < 0x20 ) // MCU旧バージョン対策 { *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCUi_ReadRegister( (u16)(MCU_OLD_REG_TEMP_ADDR + OS_MCU_RESET_VALUE_OFS) ) | HOTSTART_FLAG_ENABLE); } else +#endif { *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCUi_ReadRegister( (u16)(MCU_REG_TEMP_ADDR + OS_MCU_RESET_VALUE_OFS) ) | HOTSTART_FLAG_ENABLE); } @@ -163,7 +142,8 @@ static void PostInit(void) /* バッテリー残量チェック */ - if ( !IS_OLD_MCU ) // MCU旧バージョン対策 + MCUi_WriteRegister( MCU_REG_MODE_ADDR, MCU_SYSTEMMODE_FIRMWARE ); // change battery level only + if ( MCU_GetVerInfo() >= 0x20 ) // MCU旧バージョン対策 { if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 ) { @@ -317,7 +297,7 @@ void TwlSpMain( void ) #endif SetDebugLED( 0 ); -#ifndef PMIC_FINAL +#if SDK_TS_VERSION < 300 PMi_SetParams( REG_PMIC_BL_BRT_B_ADDR, 22, PMIC_BL_BRT_B_MASK ); #else MCUi_WriteRegister( MCU_REG_BL_ADDR, MCU_REG_BL_BRIGHTNESS_MASK );