From 7d7d2f8281d4be9ba677f8799268a90fd1d40b9f Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@4ee2a332-4b2b-5046-8439-1ba90f034370>
Date: Fri, 13 Apr 2007 02:57:05 +0000
Subject: [PATCH] add memory map of WRAM 0 and 1.

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@23 4ee2a332-4b2b-5046-8439-1ba90f034370
---
 include/nitro/hw/ARM7/mmap_global.h | 8 +++++++-
 include/nitro/hw/ARM9/mmap_global.h | 7 ++++++-
 include/nitro/os/common/interrupt.h | 2 +-
 readme.txt                          | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/include/nitro/hw/ARM7/mmap_global.h b/include/nitro/hw/ARM7/mmap_global.h
index 1c84837..298a563 100644
--- a/include/nitro/hw/ARM7/mmap_global.h
+++ b/include/nitro/hw/ARM7/mmap_global.h
@@ -91,7 +91,6 @@ extern "C" {
 
 //----------------------------- WRAM_AREA
 #define HW_WRAM_AREA            0x03000000
-#define HW_WRAM_AREA_HALF       0x03800000
 #define HW_WRAM_AREA_END        0x04000000
 #define HW_WRAM_AREA_SIZE       (HW_WRAM_AREA_END-HW_WRAM_AREA)
 
@@ -100,6 +99,13 @@ extern "C" {
 #define HW_WRAM_END             0x03800000
 #define HW_WRAM_SIZE            (HW_WRAM_END-HW_WRAM)
 
+#define HW_WRAM_0               0x037f8000
+#define HW_WRAM_0_END           0x037fc000
+#define HW_WRAM_0_SIZE          (HW_WRAM_0_END-HW_WRAM_0)
+#define HW_WRAM_1               0x037fc000
+#define HW_WRAM_1_END           0x03800000
+#define HW_WRAM_1_SIZE          (HW_WRAM_1_END-HW_WRAM_1)
+
 //----------------------------- PRV-WRAMs
 #define HW_PRV_WRAM             0x03800000
 // TEG   : ARM7 WRAM == 32KB
diff --git a/include/nitro/hw/ARM9/mmap_global.h b/include/nitro/hw/ARM9/mmap_global.h
index b610853..e2b62ec 100644
--- a/include/nitro/hw/ARM9/mmap_global.h
+++ b/include/nitro/hw/ARM9/mmap_global.h
@@ -103,13 +103,18 @@ extern u32 SDK_AUTOLOAD_DTCM_START[];
 #define HW_MAIN_MEM_HI_EX_END   (HW_MAIN_MEM_HI + HW_MAIN_MEM_HI_EX_SIZE)
 //----------------------------- WRAM_AREA
 #define HW_WRAM_AREA            0x03000000
-#define HW_WRAM_AREA_HALF       0x03800000
 #define HW_WRAM_AREA_END        0x04000000
 #define HW_WRAM_AREA_SIZE       (HW_WRAM_AREA_END-HW_WRAM_AREA)
 //----------------------------- WRAMs
 #define HW_WRAM                 0x037f8000
 #define HW_WRAM_END             0x03800000
 #define HW_WRAM_SIZE            (HW_WRAM_END-HW_WRAM)
+#define HW_WRAM_0               0x037f8000
+#define HW_WRAM_0_END           0x037fc000
+#define HW_WRAM_0_SIZE          (HW_WRAM_0_END-HW_WRAM_0)
+#define HW_WRAM_1               0x037fc000
+#define HW_WRAM_1_END           0x03800000
+#define HW_WRAM_1_SIZE          (HW_WRAM_1_END-HW_WRAM_1)
 //----------------------------- IOs
 #define HW_IOREG                0x04000000
 #define HW_IOREG_END            0x05000000
diff --git a/include/nitro/os/common/interrupt.h b/include/nitro/os/common/interrupt.h
index f6ec062..9dda095 100644
--- a/include/nitro/os/common/interrupt.h
+++ b/include/nitro/os/common/interrupt.h
@@ -442,7 +442,7 @@ void    OS_WaitAnyIrq(void);
 
   Returns:      VBlankCount
  *---------------------------------------------------------------------------*/
-static inline vu32 OS_GetVBlankCount(void)
+static inline u32 OS_GetVBlankCount(void)
 {
     return *(vu32 *)HW_VBLANK_COUNT_BUF;
 }
diff --git a/readme.txt b/readme.txt
index 52751c8..ed9c0fc 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-ビルドするには NitroSDK が必要です。
+ビルドするには NitroSDK4.0 が必要です。
 
 下記の環境変数を設定してください。
 例）TWLSDK_ROOT=c:/TwlSDK