diff options
| author | Neil Millstone | 2007-04-06 18:34:53 +0000 |
|---|---|---|
| committer | Neil Millstone | 2007-04-06 18:34:53 +0000 |
| commit | c6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe (patch) | |
| tree | d53d35422e0d3d700a48d4f1bca587eb1b7af79d /backends/platform/ds/arm9/source/fat | |
| parent | 40245fe4504ecc7cb26ccfc5b5c7d5d2b15cbbe7 (diff) | |
| download | scummvm-rg350-c6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe.tar.gz scummvm-rg350-c6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe.tar.bz2 scummvm-rg350-c6d41c07558eb74a18e88b3fc68c5ec76bb3f9fe.zip | |
Updating DS port for changes in main codebase. Code changes for DevkitArm r20 and latest libnds.
svn-id: r26394
Diffstat (limited to 'backends/platform/ds/arm9/source/fat')
| -rw-r--r-- | backends/platform/ds/arm9/source/fat/disc_io.c | 4 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/fat/gba_nds_fat.c | 3 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/fat/io_dldi.h | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/backends/platform/ds/arm9/source/fat/disc_io.c b/backends/platform/ds/arm9/source/fat/disc_io.c index 006d4f3d0f..3cb70f510b 100644 --- a/backends/platform/ds/arm9/source/fat/disc_io.c +++ b/backends/platform/ds/arm9/source/fat/disc_io.c @@ -358,10 +358,10 @@ void disc_getDldiId(char* id) { bool disc_setDsSlotInterface (void) { #ifdef ARM9 - WAIT_CR &= ~(1<<11); + REG_EXEMEMCNT &= ~(1<<11); #endif #ifdef ARM7 - WAIT_CR |= (1<<11); + REG_EXEMEMCNT |= (1<<11); #endif active_interface = DLDI_GetInterface(); diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c index 21c55cc92b..f343c4b997 100644 --- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c +++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c @@ -22,7 +22,8 @@ #include "disc_io.h" #include <string.h> #ifdef NDS - #include <nds/ipc.h> // Time on the NDS +// #include <nds/ipc.h> // Time on the NDS + #include <NDS/scummvm_ipc.h> #endif //---------------------------------------------------------------- // Data types diff --git a/backends/platform/ds/arm9/source/fat/io_dldi.h b/backends/platform/ds/arm9/source/fat/io_dldi.h index 4ef3625eba..053de3a94c 100644 --- a/backends/platform/ds/arm9/source/fat/io_dldi.h +++ b/backends/platform/ds/arm9/source/fat/io_dldi.h @@ -19,6 +19,7 @@ #include "disc_io.h" #ifdef NDS #include <nds/memory.h> +#include <nds.h> #endif extern IO_INTERFACE _io_dldi; @@ -28,7 +29,8 @@ extern u8 _dldi_driver_name; // export interface static inline LPIO_INTERFACE DLDI_GetInterface(void) { #ifdef NDS - WAIT_CR &= ~(ARM9_OWNS_ROM | ARM9_OWNS_CARD); + // NDM: I'm really not sure about this change ARM9 - ARM7 + REG_EXEMEMCNT &= ~(ARM7_OWNS_ROM | ARM7_OWNS_CARD); #endif // defined NDS return &_io_dldi; } |