TwlSDK 4174までのキャッチアップ

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@694 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2008-02-19 04:04:05 +00:00
parent 59a68061fb
commit 9b5f69cd66

View File

@ -55,6 +55,7 @@
#define THREAD_PRIO_SND 6 #define THREAD_PRIO_SND 6
#define THREAD_PRIO_FATFS 8 #define THREAD_PRIO_FATFS 8
#define THREAD_PRIO_RTC 12 #define THREAD_PRIO_RTC 12
#define THREAD_PRIO_SNDEX 14
#define THREAD_PRIO_FS 15 #define THREAD_PRIO_FS 15
/* OS_THREAD_LAUNCHER_PRIORITY 16 */ /* OS_THREAD_LAUNCHER_PRIORITY 16 */
@ -189,6 +190,10 @@ TwlSpMain(void)
// サウンド初期化 // サウンド初期化
SND_Init(THREAD_PRIO_SND); SND_Init(THREAD_PRIO_SND);
if (OS_IsRunOnTwl() == TRUE)
{
SNDEX_Init(THREAD_PRIO_SNDEX);
}
// RTC 初期化 // RTC 初期化
RTC_Init(THREAD_PRIO_RTC); RTC_Init(THREAD_PRIO_RTC);
@ -328,11 +333,7 @@ InitializeFatfs(void)
// FATFSライブラリの初期化 // FATFSライブラリの初期化
#ifndef SDK_NOCRYPTO #ifndef SDK_NOCRYPTO
#ifdef FATFS_AES_MOUNT_FOR_NAND
if(!FATFS_Init( FATFS_DMA_4, FATFS_DMA_NOT_USE, THREAD_PRIO_FATFS)) if(!FATFS_Init( FATFS_DMA_4, FATFS_DMA_NOT_USE, THREAD_PRIO_FATFS))
#else
if (FATFS_Init(FATFS_DMA_NOT_USE, FATFS_DMA_NOT_USE, THREAD_PRIO_FATFS))
#endif
#else #else
if (FATFS_Init(FATFS_DMA_NOT_USE, FATFS_DMA_NOT_USE, THREAD_PRIO_FATFS)) if (FATFS_Init(FATFS_DMA_NOT_USE, FATFS_DMA_NOT_USE, THREAD_PRIO_FATFS))
#endif #endif
@ -489,9 +490,9 @@ InitializeAllocateSystem(void)
u32 heapSize; u32 heapSize;
heapSize = (u32)OS_CheckHeap(OS_ARENA_MAIN_SUBPRIV, hh); heapSize = (u32)OS_CheckHeap(OS_ARENA_MAIN_SUBPRIV, hh);
if (ATH_DRV_HEAP_SIZE > heapSize) if ((ATH_DRV_HEAP_SIZE + WPA_HEAP_SIZE) > heapSize)
{ {
OS_Panic("Insufficient heap size. (0x%x < 0x%x)\n", heapSize, ATH_DRV_HEAP_SIZE); OS_Panic("Insufficient heap size. (0x%x < 0x%x)\n", heapSize, ATH_DRV_HEAP_SIZE + WPA_HEAP_SIZE);
} }
OS_TPrintf("ARM7: MAIN heap size is %d (before AddToHead)\n", heapSize); OS_TPrintf("ARM7: MAIN heap size is %d (before AddToHead)\n", heapSize);
} }