diff --git a/trunk/include/ctr/hw/ARM11/mmap_global.h b/trunk/include/ctr/hw/ARM11/mmap_global.h index 7db9801..209b95e 100644 --- a/trunk/include/ctr/hw/ARM11/mmap_global.h +++ b/trunk/include/ctr/hw/ARM11/mmap_global.h @@ -36,6 +36,7 @@ extern "C" { #define HW_MAIN_MEM_EX_END (HW_MAIN_MEM + HW_MAIN_MEM_EX_SIZE) #define HW_MAIN_MEM_SIZE 0x04000000 // 64MB #define HW_MAIN_MEM_EX_SIZE 0x08000000 // 128MB +#define HW_MAIN_MEM_NE1EMU_SIZE 0x10000000 // 256MB #if !defined(SDK_MG20EMU) && !defined(SDK_NE1EMU) //----------------------------- AXI-WRAM @@ -50,7 +51,7 @@ extern "C" { //----------------------------- VRAM #define HW_VRAM 0x18000000 -#define HW_VRAM_END (HW_VRAM + HW_VRAM_SIZE) +#define HW_VRAM_END (HW_MAIN_MEM + HW_VRAM_SIZE) #define HW_VRAM_SIZE 0x400000 // 4MB #else // SDK_MG20EMU || SDK_NE1EMU @@ -59,7 +60,7 @@ extern "C" { #ifdef SDK_MG20EMU #define HW_AXI_WRAM_END HW_MAIN_MEM_END #else // SDK_NE1EMU -#define HW_AXI_WRAM_END HW_MAIN_MEM_EX_END +#define HW_AXI_WRAM_END (HW_MAIN_MEM + HW_MAIN_MEM_NE1EMU_SIZE) #endif // SDK_NE1EMU #define HW_AXI_WRAM_SIZE 0x80000 // 512KB @@ -72,7 +73,7 @@ extern "C" { #ifdef SDK_MG20EMU #define HW_VRAM 0x1e000000 #else // SDK_NE1EMU -#define HW_VRAM HW_MAIN_MEM_EX_END +#define HW_VRAM HW_IOREG_END #endif // SDK_NE1EMU #define HW_VRAM_END (HW_VRAM + HW_VRAM_SIZE) #define HW_VRAM_SIZE 0x400000 // 4MB @@ -80,9 +81,14 @@ extern "C" { #endif // SDK_MG20EMU || SDK_NE1EMU //----------------------------- IOs +#ifndef SDK_NE1EMU #define HW_IOREG 0x10000000 -#define HW_IOREG_END 0x18000000 -#define HW_REG_BASE HW_IOREG // alias +#else // SDK_NE1EMU +#define HW_IOREG HW_MAIN_MEM_EX_END +#endif // SDK_NE1EMU +#define HW_IOREG_END (HW_IOREG + HW_IOREG_SIZE) +#define HW_IOREG_SIZE 0x01000000 // 16MB +#define HW_REG_BASE HW_IOREG // alias #define HW_AHBP_REG (HW_IOREG + 0x00100000) #define HW_APB_REG (HW_IOREG + 0x00200000)