From 9357d24c2844730913dc15097a1b0e0dad7e1afe Mon Sep 17 00:00:00 2001 From: yosiokat Date: Wed, 25 Jun 2008 01:14:03 +0000 Subject: [PATCH] =?UTF-8?q?SDK=20rev.6745=E3=81=AB=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=E3=80=82AES=5FInit=E3=81=A8SEA=5FInit=E3=81=AE=E5=BC=95?= =?UTF-8?q?=E6=95=B0=E3=81=AB=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89Priority?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=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@1685 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/components/hyena.TWL/src/main.c | 13 ++++--------- build/gcdfirm/sdmc-launcher/ARM7/main.c | 3 ++- build/nandfirm/menu-launcher/ARM7/main.c | 3 ++- build/nandfirm/sdmc-launcher/ARM7/main.c | 3 ++- .../NandInitializerRed/ARM7.TWL/src/main.c | 6 ++++-- .../SystemUpdater/ARM7.TWL/src/main.c | 6 ++++-- build/tests/RelocateChecker/ARM7/src/main.c | 3 ++- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c index ba877d53..f6a58fde 100644 --- a/build/components/hyena.TWL/src/main.c +++ b/build/components/hyena.TWL/src/main.c @@ -65,6 +65,8 @@ #define THREAD_PRIO_SND 6 #define THREAD_PRIO_FATFS 8 #define THREAD_PRIO_HOTSW 11 +#define THREAD_PRIO_AES 12 +#define THREAD_PRIO_SEA 12 #define THREAD_PRIO_RTC 12 #define THREAD_PRIO_SNDEX 14 #define THREAD_PRIO_FS 15 @@ -117,13 +119,6 @@ extern BOOL sdmcGetNandLogFatal( void ); Arguments: None. Returns: None. *---------------------------------------------------------------------------*/ -#define COMPONENT_WRAM_A_OFS (HW_WRAM_A_LTD - HW_WRAM_BASE) -#define COMPONENT_WRAM_A_OFS_END (COMPONENT_WRAM_A_OFS + HW_WRAM_A_SIZE) -#define COMPONENT_WRAM_B_OFS (COMPONENT_WRAM_A_OFS - HW_WRAM_B_SIZE) -#define COMPONENT_WRAM_B_OFS_END (COMPONENT_WRAM_A_OFS) -#define COMPONENT_WRAM_C_OFS (COMPONENT_WRAM_B_OFS - HW_WRAM_C_SIZE) -#define COMPONENT_WRAM_C_OFS_END (COMPONENT_WRAM_B_OFS) - void TwlSpMain(void) { @@ -198,7 +193,7 @@ TwlSpMain(void) InitializeFatfs(); // FATFS 初期化 InitializeNwm(mainHeapHandle, mainHeapHandle); // NWM 初期化 #ifndef SDK_NOCRYPTO - AES_Init(); // AES 初期化 + AES_Init(THREAD_PRIO_AES); // AES 初期化 { // JPEGエンコード用の鍵セット @@ -208,7 +203,7 @@ TwlSpMain(void) } #ifdef SDK_SEA - SEA_Init(); + SEA_Init(THREAD_PRIO_SEA); #endif // ifdef SDK_SEA #endif MCU_InitIrq(THREAD_PRIO_MCU); // MCU 初期化 diff --git a/build/gcdfirm/sdmc-launcher/ARM7/main.c b/build/gcdfirm/sdmc-launcher/ARM7/main.c index 8da659bc..9ca44d50 100644 --- a/build/gcdfirm/sdmc-launcher/ARM7/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM7/main.c @@ -61,6 +61,7 @@ static char* debugPtr = (char*)PRINT_MEMORY_ADDR; #define OS_TPrintf(...) (debugPtr += STD_TSPrintf(debugPtr, __VA_ARGS__)) #endif +#define THREAD_PRIO_AES 12 #define THREAD_PRIO_FATFS 8 #define DMA_FATFS_1 0 #define DMA_FATFS_2 1 @@ -148,7 +149,7 @@ static void PostInit(void) PM_InitFIRM(); #endif // AESの初期化 - AES_Init(); // for encrypted NAND + AES_Init(THREAD_PRIO_AES); // for encrypted NAND // マウント情報の初期化 FS_InitMountInfo(FALSE, TRUE); // アイドルスレッドの作成 diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c index be0bfa16..4353da3b 100644 --- a/build/nandfirm/menu-launcher/ARM7/main.c +++ b/build/nandfirm/menu-launcher/ARM7/main.c @@ -66,6 +66,7 @@ static char* debugPtr = (char*)PRINT_MEMORY_ADDR; #define OS_TPrintf(...) (debugPtr += STD_TSPrintf(debugPtr, __VA_ARGS__)) #endif +#define THREAD_PRIO_AES 12 #define THREAD_PRIO_FATFS 8 #define DMA_FATFS_1 0 #define DMA_FATFS_2 1 @@ -126,7 +127,7 @@ static void PostInit(void) AESi_PreInitKeys(); } // AESの初期化 - AES_Init(); // for encrypted NAND + AES_Init(THREAD_PRIO_AES); // for encrypted NAND // 4: after AES_Init PUSH_PROFILE(); SetDebugLED(++step); // 0x85 diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c index 0db0f7a4..04b62689 100644 --- a/build/nandfirm/sdmc-launcher/ARM7/main.c +++ b/build/nandfirm/sdmc-launcher/ARM7/main.c @@ -66,6 +66,7 @@ static char* debugPtr = (char*)PRINT_MEMORY_ADDR; #define OS_TPrintf(...) (debugPtr += STD_TSPrintf(debugPtr, __VA_ARGS__)) #endif +#define THREAD_PRIO_AES 12 #define THREAD_PRIO_FATFS 8 #define DMA_FATFS_1 0 #define DMA_FATFS_2 1 @@ -126,7 +127,7 @@ static void PostInit(void) AESi_PreInitKeys(); } // AESの初期化 - AES_Init(); // for encrypted NAND + AES_Init(THREAD_PRIO_AES); // for encrypted NAND // マウント情報の初期化 FS_InitMountInfo(FALSE, TRUE); // アイドルスレッドの作成 diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c index cd65e253..a7f8922a 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c @@ -51,6 +51,8 @@ #define THREAD_PRIO_NWM_COMMAND 9 #define THREAD_PRIO_NWM_WPA 10 #define THREAD_PRIO_HOTSW 11 +#define THREAD_PRIO_AES 12 +#define THREAD_PRIO_SEA 12 #define THREAD_PRIO_RTC 12 #define THREAD_PRIO_SNDEX 14 #define THREAD_PRIO_FS 15 @@ -124,8 +126,8 @@ TwlSpMain(void) #endif /* 各ライブラリ初期化 */ - AES_Init(); // AES - SEA_Init(); // SEA + AES_Init(THREAD_PRIO_AES); // AES + SEA_Init(THREAD_PRIO_SEA); // SEA FS_Init(FS_DMA_NOT_USE); // FS for CARD FS_CreateReadServerThread(THREAD_PRIO_FS); // FS for CARD InitializeFatfs(); // FAT-FS diff --git a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/src/main.c b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/src/main.c index 184fb5c3..bec3132f 100644 --- a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/src/main.c +++ b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/src/main.c @@ -49,6 +49,8 @@ #define THREAD_PRIO_NWM_COMMAND 9 #define THREAD_PRIO_NWM_WPA 10 #define THREAD_PRIO_HOTSW 11 +#define THREAD_PRIO_AES 12 +#define THREAD_PRIO_SEA 12 #define THREAD_PRIO_RTC 12 #define THREAD_PRIO_SNDEX 14 #define THREAD_PRIO_FS 15 @@ -117,8 +119,8 @@ TwlSpMain(void) (void)OS_EnableInterrupts(); /* 各ライブラリ初期化 */ - AES_Init(); // AES - SEA_Init(); // SEA + AES_Init(THREAD_PRIO_AES); // AES + SEA_Init(THREAD_PRIO_SEA); // SEA FS_Init(FS_DMA_NOT_USE); // FS for CARD FS_CreateReadServerThread(THREAD_PRIO_FS); // FS for CARD InitializeFatfs(); // FAT-FS diff --git a/build/tests/RelocateChecker/ARM7/src/main.c b/build/tests/RelocateChecker/ARM7/src/main.c index 4f4db021..b314193d 100644 --- a/build/tests/RelocateChecker/ARM7/src/main.c +++ b/build/tests/RelocateChecker/ARM7/src/main.c @@ -46,6 +46,7 @@ #define THREAD_PRIO_SPI 2 #define THREAD_PRIO_SND 6 #define THREAD_PRIO_FATFS 8 +#define THREAD_PRIO_AES 12 #define THREAD_PRIO_RTC 12 #define THREAD_PRIO_FS 15 /* OS_THREAD_LAUNCHER_PRIORITY 16 */ @@ -151,7 +152,7 @@ TwlSpMain(void) if (OS_IsRunOnTwl() == TRUE) { #ifndef SDK_NOCRYPTO - AES_Init(); // AES 初期化 + AES_Init(THREAD_PRIO_AES); // AES #endif }