diff options
| author | Tony Puccinelli | 2010-08-11 02:44:11 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-11 02:44:11 +0000 |
| commit | 2f3ab6bdab2853de04fc58c409064e99d97aa29d (patch) | |
| tree | 83c698a7505ad56ac6b4e3c0dd3b399706729424 /backends/platform/ds | |
| parent | 7d5c66808ff08ce08aa6a63bca9b37a0a129a8a3 (diff) | |
| parent | fffec23a02cc88ed8daba0a3b50007b7e220c075 (diff) | |
| download | scummvm-rg350-2f3ab6bdab2853de04fc58c409064e99d97aa29d.tar.gz scummvm-rg350-2f3ab6bdab2853de04fc58c409064e99d97aa29d.tar.bz2 scummvm-rg350-2f3ab6bdab2853de04fc58c409064e99d97aa29d.zip | |
manually merged trunk/backends into branch and removed some now redundant elf32.h files
svn-id: r51966
Diffstat (limited to 'backends/platform/ds')
| -rw-r--r-- | backends/platform/ds/arm7/source/main.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 3 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/fat/io_nmmc.c | 10 |
3 files changed, 7 insertions, 10 deletions
diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp index 75f7012ed0..bcaaf8e936 100644 --- a/backends/platform/ds/arm7/source/main.cpp +++ b/backends/platform/ds/arm7/source/main.cpp @@ -40,7 +40,7 @@ #include <system.h> #include <stdlib.h> #include <string.h> -#include <registers_alt.h> // Needed for SOUND_CR +#include <registers_alt.h> // Needed for SOUND_CR #include <NDS/scummvm_ipc.h> ////////////////////////////////////////////////////////////////////// #ifdef USE_DEBUGGER @@ -592,7 +592,7 @@ int main(int argc, char ** argv) { IPC->reset = false; - //fifoInit(); + //fifoInit(); for (int r = 0; r < 8; r++) { IPC->adpcm.arm7Buffer[r] = (u8 *) malloc(512); diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index c9a665c442..407df8243c 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -354,9 +354,6 @@ OBJS := $(DATA_OBJS) $(PORT_OBJS) $(FAT_OBJS) MODULE_DIRS += . -#ndsall: plugins -# make -f makefile scummvm.nds - ndsall: plugins make -f makefile scummvm.nds scummvm.ds.gba diff --git a/backends/platform/ds/arm9/source/fat/io_nmmc.c b/backends/platform/ds/arm9/source/fat/io_nmmc.c index 261096a27b..6c996f5de1 100644 --- a/backends/platform/ds/arm9/source/fat/io_nmmc.c +++ b/backends/platform/ds/arm9/source/fat/io_nmmc.c @@ -170,7 +170,7 @@ bool NMMC_IsInserted(void) { Neo_EnableMMC( true ); // Open SPI port to MMC card Neo_SendMMCCommand(MMC_SEND_CSD, 0); - if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured + if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred Neo_EnableMMC( false ); return false; } @@ -227,14 +227,14 @@ bool NMMC_StartUp(void) { // Set block length Neo_SendMMCCommand(MMC_SET_BLOCKLEN, BYTE_PER_READ ); - if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured + if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred Neo_EnableMMC( false ); return false; } // Check if we can use a higher SPI frequency Neo_SendMMCCommand(MMC_SEND_CSD, 0); - if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured + if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred Neo_EnableMMC( false ); return false; } @@ -268,7 +268,7 @@ bool NMMC_WriteSectors (u32 sector, u8 numSecs, void* buffer) Neo_EnableMMC( true ); // Open SPI port to MMC card Neo_SendMMCCommand( 25, sector ); - if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured + if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred Neo_EnableMMC( false ); return false; } @@ -318,7 +318,7 @@ bool NMMC_ReadSectors (u32 sector, u8 numSecs, void* buffer) while (totalSecs--) { Neo_SendMMCCommand(MMC_READ_BLOCK, sector ); - if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occured + if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false ) { // Make sure no errors occurred Neo_EnableMMC( false ); return false; } |