From 989c1fddddbe63075a9d4b9860476a080711164c Mon Sep 17 00:00:00 2001
From: Neil Millstone
Date: Sat, 29 May 2010 20:30:54 +0000
Subject: DS: Various fixes to allow the DS port to compile on DevkitARM r30
 and libnds 1.4.3.

svn-id: r49313
---
 backends/platform/ds/arm7/source/main.cpp            |  4 ++--
 backends/platform/ds/arm9/makefile                   |  2 +-
 backends/platform/ds/arm9/source/dsmain.cpp          |  4 ++--
 backends/platform/ds/commoninclude/NDS/scummvm_ipc.h | 12 ++++++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'backends/platform/ds')

diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp
index 7029d96405..a4cde02ba6 100644
--- a/backends/platform/ds/arm7/source/main.cpp
+++ b/backends/platform/ds/arm7/source/main.cpp
@@ -38,7 +38,7 @@
 #include <system.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <registers_alt.h>	// not needed in current libnds
+#include <registers_alt.h>		// Needed for SOUND_CR
 #include <NDS/scummvm_ipc.h>
 //////////////////////////////////////////////////////////////////////
 #ifdef USE_DEBUGGER
@@ -590,7 +590,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 eca170ef96..7f03f4c310 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -75,7 +75,7 @@ else
 			ifdef DS_BUILD_K
 
 			else
-				USE_MAD = 1
+		#		USE_MAD = 1
 			endif
 		endif
 	endif
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 1e9986e4e9..4828ae2192 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -701,7 +701,7 @@ void displayMode8Bit() {
 
 
 
-	consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 2, 0, true);
+	consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 2, 0, true, true);
 
 	// Set this again because consoleinit resets it
 	videoSetMode(MODE_5_2D | (consoleEnable? DISPLAY_BG0_ACTIVE: 0) | DISPLAY_BG3_ACTIVE | DISPLAY_SPR_ACTIVE | DISPLAY_SPR_1D | DISPLAY_SPR_1D_BMP);
@@ -939,7 +939,7 @@ void displayMode16Bit() {
 	SUB_BG0_CR = BG_MAP_BASE(4) | BG_TILE_BASE(0);
 	SUB_BG0_Y0 = 0;
 
-	consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 4, 0, false);
+	consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 4, 0, false, true);
 //	consoleInitDefault((u16*)SCREEN_BASE_BLOCK_SUB(4), (u16*)CHAR_BASE_BLOCK_SUB(0), 16);
 
 	for (int r = 0; r < 32 * 32; r++) {
diff --git a/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h b/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
index 9344be68f9..f41548f400 100644
--- a/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
+++ b/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
@@ -33,6 +33,18 @@
 //////////////////////////////////////////////////////////////////////
 
 
+typedef struct sTransferSoundData {
+//---------------------------------------------------------------------------------
+        const void *data;
+        u32 len;
+        u32 rate;
+        u8 vol;
+        u8 pan;
+        u8 format;
+        u8 PADDING;
+} TransferSoundData, * pTransferSoundData;
+
+
 
 
 //---------------------------------------------------------------------------------
-- 
cgit v1.2.3