rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

PMIC_FINAL => SDK_TS_VERSION

Browse Source 
mcuバージョンチェックのコード変更

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1119 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2008-04-14 04:43:00 +00:00
parent 903ac8c268
commit a86fac4a8c
4 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/gcdfirm/gcdfirm-disp/ARM7/main.c
View File

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

2
build/gcdfirm/sdmc-launcher/ARM7/main.c
View File

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

30
build/nandfirm/menu-launcher/ARM7/main.c
View File

@ -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 )
{

32
build/nandfirm/sdmc-launcher/ARM7/main.c
View File

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