From 247032cc4890a81432cc1e4c098919be91892690 Mon Sep 17 00:00:00 2001 From: yutaka Date: Thu, 31 Jan 2008 08:25:11 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9B=E3=83=83=E3=83=88=E3=83=AA=E3=82=BB?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=81=AE=E4=BF=9D=E5=AD=98=E5=A0=B4=E6=89=80=E5=A4=89=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@554 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/gcdfirm/sdmc-launcher/ARM7/main.c | 6 +++--- build/nandfirm/menu-launcher/ARM7/main.c | 13 +++---------- build/nandfirm/menu-launcher2/ARM7/main.c | 5 +++-- build/nandfirm/sdmc-launcher/ARM7/main.c | 13 +++---------- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/build/gcdfirm/sdmc-launcher/ARM7/main.c b/build/gcdfirm/sdmc-launcher/ARM7/main.c index 8f78695d..a1584f59 100644 --- a/build/gcdfirm/sdmc-launcher/ARM7/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM7/main.c @@ -110,10 +110,10 @@ static void PreInit(void) OS_Terminate(); } /* - リセットパラメータ(1バイト)を共有領域(4バイト)にコピー + リセットパラメータ(1バイト)を共有領域(1バイト)にコピー */ -#define FIRM_AVAILABLE_BIT 0x80000000UL - *(u32*)HW_RESET_PARAMETER_BUF = (u32)MCUi_ReadRegister( MCU_REG_TEMP_ADDR ) | FIRM_AVAILABLE_BIT; +#define HOTSTART_FLAG_ENABLE 0x80 + *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCU_GetFreeRegister( OS_MCU_RESET_VALUE_OFS ) | HOTSTART_FLAG_ENABLE); } /*************************************************************** diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c index 3d0e3deb..f5dc3433 100644 --- a/build/nandfirm/menu-launcher/ARM7/main.c +++ b/build/nandfirm/menu-launcher/ARM7/main.c @@ -110,17 +110,10 @@ static void PreInit(void) OS_Terminate(); } /* - リセットパラメータ(1バイト)を共有領域(4バイト)にコピー + リセットパラメータ(1バイト)を共有領域(1バイト)にコピー */ - *(u32*)HW_RESET_PARAMETER_BUF = (u32)(MCU_GetFreeRegister( OS_MCU_RESET_VALUE_OFS ) | OS_MCU_RESET_VALUE_BUF_ENABLE_MASK); - /* - バッテリー残量チェック - */ - if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 ) - { - OS_TPrintf("Battery is empty.\n"); - OS_Terminate(); - } +#define HOTSTART_FLAG_ENABLE 0x80 + *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCU_GetFreeRegister( OS_MCU_RESET_VALUE_OFS ) | HOTSTART_FLAG_ENABLE); } /*************************************************************** diff --git a/build/nandfirm/menu-launcher2/ARM7/main.c b/build/nandfirm/menu-launcher2/ARM7/main.c index c0a6d57c..8978e012 100644 --- a/build/nandfirm/menu-launcher2/ARM7/main.c +++ b/build/nandfirm/menu-launcher2/ARM7/main.c @@ -111,9 +111,10 @@ static void PreInit(void) OS_Terminate(); } /* - リセットパラメータ(1バイト)を共有領域(4バイト)にコピー + リセットパラメータ(1バイト)を共有領域(1バイト)にコピー */ - *(u32*)HW_RESET_PARAMETER_BUF = (u32)(MCU_GetFreeRegister( OS_MCU_RESET_VALUE_OFS ) | OS_MCU_RESET_VALUE_BUF_ENABLE_MASK); +#define HOTSTART_FLAG_ENABLE 0x80 + *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCU_GetFreeRegister( OS_MCU_RESET_VALUE_OFS ) | HOTSTART_FLAG_ENABLE); } /*************************************************************** diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c index d648dfdb..e248beeb 100644 --- a/build/nandfirm/sdmc-launcher/ARM7/main.c +++ b/build/nandfirm/sdmc-launcher/ARM7/main.c @@ -110,17 +110,10 @@ static void PreInit(void) OS_Terminate(); } /* - リセットパラメータ(1バイト)を共有領域(4バイト)にコピー + リセットパラメータ(1バイト)を共有領域(1バイト)にコピー */ - *(u32*)HW_RESET_PARAMETER_BUF = (u32)(MCU_GetFreeRegister( OS_MCU_RESET_VALUE_OFS ) | OS_MCU_RESET_VALUE_BUF_ENABLE_MASK); - /* - バッテリー残量チェック - */ - if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 ) - { - OS_TPrintf("Battery is empty.\n"); - OS_Terminate(); - } +#define HOTSTART_FLAG_ENABLE 0x80 + *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCU_GetFreeRegister( OS_MCU_RESET_VALUE_OFS ) | HOTSTART_FLAG_ENABLE); } /***************************************************************