add wram_abc and ex_dma codes.

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@16 4ee2a332-4b2b-5046-8439-1ba90f034370

build/libraries/mi/ARM7/Makefile

@@ -35,7 +35,7 @@ INCDIR			+= $(TWL_NITROSDK_ROOT)/build/libraries/mi/common/include \
 
 SRCS			= \
               mi_dma.c \
-			  mi_edma.c \
+			  mi_exDma.c \
 			  mi_dma_hblank.c \
 			  mi_dma_vblank.c \
 			  mi_dma_mainmem.c \

build/libraries/mi/ARM9/Makefile

@@ -31,7 +31,7 @@ INCDIR			+= $(TWL_NITROSDK_ROOT)/build/libraries/mi/common/include \
 
 SRCS			= mi_wram.c \
 			  mi_dma.c \
-			  mi_edma.c \
+			  mi_exDma.c \
 			  mi_dma_hblank.c \
 			  mi_dma_vblank.c \
 			  mi_dma_mainmem.c \

build/libraries/mi/common/mi_exDma.c

@@ -0,0 +1,625 @@
+/*---------------------------------------------------------------------------*
+  Project:  TwlSDK - MI
+  File:     mi_exDma.c
+
+  Copyright 2007 Nintendo.  All rights reserved.
+
+  These coded instructions, statements, and computer programs contain
+  proprietary information of Nintendo of America Inc. and/or Nintendo
+  Company Ltd., and are protected by Federal copyright law.  They may
+  not be disclosed to third parties or copied or duplicated in any form,
+  in whole or in part, without the prior written consent of Nintendo.
+
+  $Log: $
+  $NoKeywords: $
+ *---------------------------------------------------------------------------*/
+
+#include <twl.h>
+
+static BOOL isArbitrated = FALSE;
+
+static u32 intervalTable[] =
+{
+    200, 100, 50, 4,
+};
+
+//================================================================================
+//            memory oparation using DMA (sync)
+//================================================================================
+/*---------------------------------------------------------------------------*
+  Name:         MIi_SetExDmaArbiter
+
+  Description:  set DMA arbitration
+
+  Arguments:    arb : arbitration algorism
+                yld : yield cycles for round robin
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_SetExDmaArbiter( MIEDmaArbitration arb, MIEDmaYieldCycles yld )
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+
+    reg_MI_DMAGBL = (u32)(arb | yld);
+
+    isArbitrated = TRUE;
+
+    (void)OS_RestoreInterrupts(enabled);
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaFill
+
+  Description:  fill memory with specified data.
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                data  : fill data
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaFill( MIExDmaNo dmaNo, void *dest, u32 data, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaFillCore( dmaNo, dest, data, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaCopy
+
+  Description:  copy memory with DMA
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaCopy( MIExDmaNo dmaNo, const void *src, void *dest, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaCopyCore( dmaNo, src, dest, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaSend
+
+  Description:  send data with DMA
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaSend( MIExDmaNo dmaNo, const void *src, void *dest, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaSendCore( dmaNo, src, dest, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaRecv
+
+  Description:  receive data with DMA
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaRecv( MIExDmaNo dmaNo, const void *src, void *dest, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaRecvCore( dmaNo, src, dest, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaFillAsync
+
+  Description:  fill memory with specified data.
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                data  : fill data
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaFillAsync( MIExDmaNo dmaNo, void *dest, u32 data, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaFillAsyncCore( dmaNo, dest, data, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaCopyAsync
+
+  Description:  copy memory with DMA
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaCopyAsync( MIExDmaNo dmaNo, const void *src, void *dest, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaCopyAsyncCore( dmaNo, src, dest, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM);
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaSendAsync
+
+  Description:  send data with DMA
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaSendAsync( MIExDmaNo dmaNo, const void *src, void *dest, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaSendAsyncCore( dmaNo, src, dest, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaRecvAsync
+
+  Description:  receive data with DMA
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaRecvAsync( MIExDmaNo dmaNo, const void *src, void *dest, u32 size )
+{
+    MIEDmaBlockSize blockSize = MI_EDMA_BLOCK_32B;
+    u32 interval = intervalTable[dmaNo];
+    MIEDmaPrescaler prescale = MI_EDMA_PRESCALER_1;
+
+    MIi_ExDmaRecvAsyncCore( dmaNo, src, dest, size, size,
+                blockSize, interval, prescale,
+                MI_EDMA_CONTINUOUS_OFF, MI_EDMA_SRC_RLD_OFF, MI_EDMA_DEST_RLD_OFF,
+                MI_EDMA_TIMING_IMM );
+}
+
+//----------------- internel functions -------------------
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaFillCore
+
+  Description:  fill memory with specified data.
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                data  : fill data
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaFillCore( MIExDmaNo dmaNo, void *dest, u32 data, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_ExDmaFillAsyncCore( dmaNo, dest, data, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing );
+
+    MIi_WaitExDma( dmaNo );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaCopyCore
+
+  Description:  copy memory with DMA
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaCopyCore( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_ExDmaCopyAsyncCore( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing );
+
+    MIi_WaitExDma( dmaNo );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaSendCore
+
+  Description:  copy memory with DMA
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaSendCore( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_ExDmaSendAsyncCore( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing );
+
+    MIi_WaitExDma( dmaNo );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaRecvCore
+
+  Description:  copy memory with DMA
+                sync version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaRecvCore( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_ExDmaRecvAsyncCore( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing );
+
+    MIi_WaitExDma( dmaNo );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaFillAsyncCore
+
+  Description:  fill memory with specified data.
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaFillAsyncCore( MIExDmaNo dmaNo, void *dest, u32 data, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    const void *src = NULL;
+    u32 srcDir = MI_EDMA_SRC_FILLREG;
+
+    MIi_WaitExDma( dmaNo );
+
+    if (!isArbitrated )
+    {
+        MIi_SetExDmaArbiter( MI_EDMAGBL_ARB_ROUND_ROBIN, MI_EDMAGBL_YLD_CYCLE_16 );
+    }
+
+    MIi_SetExDmaParams( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing,
+                data, srcDir, MI_EDMA_DEST_INC );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaCopyAsyncCore
+
+  Description:  copy memory with DMA
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaCopyAsyncCore( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_WaitExDma( dmaNo );
+
+    if (!isArbitrated )
+    {
+        MIi_SetExDmaArbiter( MI_EDMAGBL_ARB_ROUND_ROBIN, MI_EDMAGBL_YLD_CYCLE_16 );
+    }
+
+    MIi_SetExDmaParams( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing,
+                0, MI_EDMA_SRC_INC, MI_EDMA_DEST_INC );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaSendAsyncCore
+
+  Description:  copy memory with DMA
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaSendAsyncCore( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_WaitExDma( dmaNo );
+
+    if (!isArbitrated )
+    {
+        MIi_SetExDmaArbiter( MI_EDMAGBL_ARB_ROUND_ROBIN, MI_EDMAGBL_YLD_CYCLE_16 );
+    }
+
+    MIi_SetExDmaParams( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing,
+                0, MI_EDMA_SRC_INC, MI_EDMA_DEST_FIX );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaRecvAsyncCore
+
+  Description:  copy memory with DMA
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaRecvAsyncCore( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_WaitExDma( dmaNo );
+
+    if (!isArbitrated )
+    {
+        MIi_SetExDmaArbiter( MI_EDMAGBL_ARB_ROUND_ROBIN, MI_EDMAGBL_YLD_CYCLE_16 );
+    }
+
+    MIi_SetExDmaParams( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing,
+                0, MI_EDMA_SRC_FIX, MI_EDMA_DEST_INC );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_ExDmaBypassAsyncCore
+
+  Description:  copy memory with DMA
+                async version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_ExDmaBypassAsyncCore( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing )
+{
+    MIi_WaitExDma( dmaNo );
+
+    if (!isArbitrated )
+    {
+        MIi_SetExDmaArbiter( MI_EDMAGBL_ARB_ROUND_ROBIN, MI_EDMAGBL_YLD_CYCLE_16 );
+    }
+
+    MIi_SetExDmaParams( dmaNo, src, dest, size, oneShotSize,
+                blockSize, interval, prescale,
+                continuous, srcRld, destRld,
+                timing,
+                0, MI_EDMA_SRC_FIX, MI_EDMA_DEST_FIX );
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_SetExDmaParams
+
+  Description:  copy memory with DMA
+                sync 32bit version
+
+  Arguments:    dmaNo : DMA channel No.
+                dest  : destination address
+                src   : source address
+                size  : size (byte)
+                blockSize : block size
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_SetExDmaParams( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+                MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
+                u32 continuous, u32 srcRld, u32 destRld,
+                MIEDmaTiming timing,
+                u32 fillData, u32 srcDir, u32 destDir )
+{
+    {
+        OSIntrMode enabled = OS_DisableInterrupts();
+
+        MIEDmaChanRegs *reg = &((MIEDmaChanRegs*)REG_DMA4SAD_ADDR)[dmaNo];
+
+        reg->src = src;
+        reg->dest = dest;
+        reg->fillData = fillData;
+        reg->totalCount = size / 4;
+        reg->wordCount = oneShotSize / 4;
+        reg->blockInterval = (interval << MI_EDMABCNT_INTERVAL_SHIFT) | prescale;
+        reg->ctrl = blockSize
+                  | srcDir | destDir
+                  | srcRld | destRld
+                  | continuous
+                  | timing
+                  | MI_EDMA_ENABLE | MI_EDMA_IF_ENABLE;
+
+        (void)OS_RestoreInterrupts(enabled);
+    }
+}
+
+//================================================================================
+//       DMA WAIT/STOP
+//================================================================================
+/*---------------------------------------------------------------------------*
+  Name:         MIi_IsExDmaBusy
+
+  Description:  check whether extended DMA is busy or not
+
+  Arguments:    dmaNo : DMA channel No.
+
+  Returns:      TRUE if extended DMA is busy, FALSE if not
+ *---------------------------------------------------------------------------*/
+BOOL MIi_IsExDmaBusy( MIExDmaNo dmaNo )
+{
+    MIEDmaChanRegs *reg = &((MIEDmaChanRegs*)REG_DMA4SAD_ADDR)[dmaNo];
+
+    return (BOOL)((reg->ctrl & REG_MI_DMA4CNT_E_MASK) >> REG_MI_DMA4CNT_E_SHIFT);
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_WaitExDma
+
+  Description:  wait while extended DMA is busy
+
+  Arguments:    dmaNo : DMA channel No.
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_WaitExDma( MIExDmaNo dmaNo )
+{
+    MIEDmaChanRegs *reg = &((MIEDmaChanRegs*)REG_DMA4SAD_ADDR)[dmaNo];
+
+    while (reg->ctrl & REG_MI_DMA4CNT_E_MASK)
+    {
+    }
+}
+
+/*---------------------------------------------------------------------------*
+  Name:         MIi_StopDma
+
+  Description:  stop extended DMA
+
+  Arguments:    dmaNo : DMA channel No.
+
+  Returns:      None
+ *---------------------------------------------------------------------------*/
+void MIi_StopExDma( MIExDmaNo dmaNo )
+{
+    OSIntrMode enabled = OS_DisableInterrupts();
+    MIEDmaChanRegs *reg = &((MIEDmaChanRegs*)REG_DMA4SAD_ADDR)[dmaNo];
+
+    reg->ctrl &= ~MI_EDMA_ENABLE;
+
+    (void)OS_RestoreInterrupts(enabled);
+}
+

include/twl/mi.h

@@ -19,8 +19,8 @@
 
 #include <nitro/mi.h>
 
-#include <twl/mi/ex_dma.h>
+#include <twl/mi/exDma.h>
-#include <twl/mi/ex_wram.h>
+#include <twl/mi/wram_abc.h>
 
 #ifdef __cplusplus
 extern "C" {

include/twl/mi/exDma.h

@@ -1,6 +1,6 @@
 /*---------------------------------------------------------------------------*
   Project:  TwlSDK - MI - include
-  File:     edma.h
+  File:     exDma.h
 
   Copyright 2007 Nintendo.  All rights reserved.
 
@@ -13,8 +13,8 @@
   $Log: $
   $NoKeywords: $
  *---------------------------------------------------------------------------*/
-#ifndef TWL_MI_DMA_H_
+#ifndef TWL_MI_EXDMA_H_
-#define TWL_MI_DMA_H_
+#define TWL_MI_EXDMA_H_
 
 #include <nitro/misc.h>
 #include <nitro/types.h>
@@ -523,7 +523,7 @@ void MIi_ExDmaBypassAsyncCore( MIExDmaNo dmaNo, const void *src, void *dest, u32
                 MIEDmaTiming timing );
 
 /*---------------------------------------------------------------------------*
-  Name:         MIi_SetDmaParams
+  Name:         MIi_SetExDmaParams
 
   Description:  copy memory with DMA
                 sync 32bit version
@@ -536,7 +536,7 @@ void MIi_ExDmaBypassAsyncCore( MIExDmaNo dmaNo, const void *src, void *dest, u32
 
   Returns:      None
  *---------------------------------------------------------------------------*/
-void MIi_SetDmaParams( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
+void MIi_SetExDmaParams( MIExDmaNo dmaNo, const void *src, void *dest, u32 size, u32 oneShotSize,
                 MIEDmaBlockSize blockSize, u32 interval, MIEDmaPrescaler prescale,
                 u32 continuous, u32 srcRld, u32 destRld,
                 MIEDmaTiming timing,
@@ -560,5 +560,5 @@ void MIi_SetExDmaArbiter( MIEDmaArbitration arb, MIEDmaYieldCycles yld );
 
 #endif
 
-/* TWL_MI_DMA_H_ */
+/* TWL_MI_EXDMA_H_ */
 #endif

include/twl/mi/wram_abc.h

@@ -1,6 +1,6 @@
 /*---------------------------------------------------------------------------*
   Project:  TwlSDK - MI - include
-  File:     ex_wram.h
+  File:     wram_abc.h
 
   Copyright 2007 Nintendo.  All rights reserved.
 
@@ -14,8 +14,8 @@
   $NoKeywords: $
  *---------------------------------------------------------------------------*/
 
-#ifndef TWL_MI_EXWRAM_H_
+#ifndef TWL_MI_WRAM_ABC_H_
-#define TWL_MI_EXWRAM_H_
+#define TWL_MI_WRAM_ABC_H_
 
 #include <twl/ioreg.h>
 
@@ -26,6 +26,7 @@ extern "C" {
 //----------------------------------------------------------------
 //    enum definition
 //
+
 typedef enum
 {
     MI_WRAM_A_ARM9 = 0 << REG_MI_WRAM_A0_MST_SHIFT,
@@ -84,10 +85,41 @@ typedef enum
 }
 MIOfsWramC;
 
+typedef enum
+{
+    MI_WRAM_A_IMG_64KB  = 0 << REG_MI_WRAM_A_MAP_IMG_SHIFT,
+    MI_WRAM_A_IMG_128KB = 1 << REG_MI_WRAM_A_MAP_IMG_SHIFT,
+    MI_WRAM_A_IMG_256KB = 2 << REG_MI_WRAM_A_MAP_IMG_SHIFT
+}
+MIImageWramA;
+
+typedef enum
+{
+    MI_WRAM_B_IMG_32KB  = 0 << REG_MI_WRAM_B_MAP_IMG_SHIFT,
+    MI_WRAM_B_IMG_64KB  = 1 << REG_MI_WRAM_B_MAP_IMG_SHIFT,
+    MI_WRAM_B_IMG_128KB = 2 << REG_MI_WRAM_B_MAP_IMG_SHIFT,
+    MI_WRAM_B_IMG_256KB = 3 << REG_MI_WRAM_B_MAP_IMG_SHIFT
+}
+MIImageWramB;
+
+typedef enum
+{
+    MI_WRAM_C_IMG_32KB  = 0 << REG_MI_WRAM_C_MAP_IMG_SHIFT,
+    MI_WRAM_C_IMG_64KB  = 1 << REG_MI_WRAM_C_MAP_IMG_SHIFT,
+    MI_WRAM_C_IMG_128KB = 2 << REG_MI_WRAM_C_MAP_IMG_SHIFT,
+    MI_WRAM_C_IMG_256KB = 3 << REG_MI_WRAM_C_MAP_IMG_SHIFT
+}
+MIImageWramC;
+
+
+#define MI_WRAM_A_BLOCK_SIZE  0x00010000  // 64KB
+#define MI_WRAM_B_BLOCK_SIZE  0x00008000  // 32KB
+#define MI_WRAM_C_BLOCK_SIZE  0x00008000  // 32KB
+
 
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
 
-/* TWL_MI_EXWRAM_H_ */
+/* TWL_MI_WRAM_ABC_H_ */
 #endif