From 073c4fab824916d9e9cfe3bde37c8397eb5ddb88 Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@4ee2a332-4b2b-5046-8439-1ba90f034370>
Date: Wed, 18 Jul 2007 09:01:31 +0000
Subject: [PATCH] fixed ASSERT in DEBUG mode

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@193 4ee2a332-4b2b-5046-8439-1ba90f034370
---
 build/libraries/dsp/ARM9/dsp_if.c | 2 +-
 include/twl/aes/ARM7/transfer.h   | 4 ++--
 include/twl/aes/common/assert.h   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/libraries/dsp/ARM9/dsp_if.c b/build/libraries/dsp/ARM9/dsp_if.c
index ec7cbad..19e8c42 100644
--- a/build/libraries/dsp/ARM9/dsp_if.c
+++ b/build/libraries/dsp/ARM9/dsp_if.c
@@ -325,7 +325,7 @@ void DSP_RecvFifoEx(DSPFifoMemSel memsel, u16* dest, u16 src, int size, u16 flag
     DSPFifoRecvLength len;
     u16 incmode = (u16)((flags & DSP_FIFO_FLAG_SRC_FIX) ? 0 : REG_DSP_PCFG_AIM_MASK);
 
-    SDK_ASSERT(memsel != DSP_MEMSEL_PROGRAM);
+    SDK_ASSERT(memsel != DSP_FIFO_MEMSEL_PROGRAM);
 
     switch (flags & DSP_FIFO_FLAG_RECV_MASK)
     {
diff --git a/include/twl/aes/ARM7/transfer.h b/include/twl/aes/ARM7/transfer.h
index 9bec387..97e1620 100644
--- a/include/twl/aes/ARM7/transfer.h
+++ b/include/twl/aes/ARM7/transfer.h
@@ -135,7 +135,7 @@ static inline void AES_DmaRecvAsync(u32 dmaNo, void *dest, u32 length)
 static inline void AES_CpuSend(const void *src, u32 length)
 {
     const u32 *ptr = src;
-    SDK_ASSERT(src && (src & 0x3) == 0);
+    SDK_ASSERT(src && ((u32)src & 0x3) == 0);
     AES_ASSERT_DATA_LENGTH(length);
     while (length > 0) {
         AES_WaitInputFifoNotFull();
@@ -159,7 +159,7 @@ static inline void AES_CpuSend(const void *src, u32 length)
 static inline void AES_CpuRecv(void *dest, u32 length)
 {
     u32 *ptr = dest;
-    SDK_ASSERT(dest && (dest & 0x3) == 0);
+    SDK_ASSERT(dest && ((u32)dest & 0x3) == 0);
     AES_ASSERT_DATA_LENGTH(length);
     while (length > 0) {
         AES_WaitOutputFifoNotEmpty();
diff --git a/include/twl/aes/common/assert.h b/include/twl/aes/common/assert.h
index c36ecd0..6a46aff 100644
--- a/include/twl/aes/common/assert.h
+++ b/include/twl/aes/common/assert.h
@@ -19,6 +19,8 @@
 /*---------------------------------------------------------------------------*
     ASSERT
  *---------------------------------------------------------------------------*/
+#define AES_KEY_MAX_NUM 3
+
 #define AES_ASSERT_KEYNO( keyNo )        SDK_ASSERTMSG( (keyNo) <= AES_KEY_MAX_NUM, "illegal AES Key No." )
 #define AES_ASSERT_DATA_LENGTH( len )    SDK_ASSERTMSG( (len) & 0xFF0000FF, "illegal data length." )