DS: Only include NDS/scummvm_ipc.h where necessary; minor tweaks

svn-id: r50702

5 files changed, 20 insertions, 21 deletions

diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 7315c25a43..d1e30b93cd 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -85,6 +85,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "NDS/scummvm_ipc.h"
 #include "dsmain.h"
 #include "osystem_ds.h"
 #include "icons_raw.h"
diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h
index 89b8c708b7..bd627fa620 100644
--- a/backends/platform/ds/arm9/source/dsmain.h
+++ b/backends/platform/ds/arm9/source/dsmain.h
@@ -28,7 +28,6 @@
 
 #include <nds.h>
 #include "osystem_ds.h"
-#include "NDS/scummvm_ipc.h"
 
 namespace DS {
 
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp
index ce3e2416af..7b5e8c2b52 100644
--- a/backends/platform/ds/arm9/source/touchkeyboard.cpp
+++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp
@@ -20,6 +20,7 @@
  *
  */
 #include <nds.h>
+#include "NDS/scummvm_ipc.h"
 #include "touchkeyboard.h"
 #include "keyboard_raw.h"
 #include "keyboard_pal_raw.h"
diff --git a/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h b/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
index c762d1acd1..e0cda4d972 100644
--- a/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
+++ b/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
@@ -33,31 +33,29 @@
 //////////////////////////////////////////////////////////////////////
 
 
-typedef struct sTransferSoundData {
-//---------------------------------------------------------------------------------
-        const void *data;
-        u32 len;
-        u32 rate;
-        u8 vol;
-        u8 pan;
-        u8 format;
-        u8 PADDING;
-} TransferSoundData, * pTransferSoundData;
+typedef struct {
+	const void *data;
+	u32 len;
+	u32 rate;
+	u8 vol;
+	u8 pan;
+	u8 format;
+	u8 PADDING;
+} TransferSoundData;
 
 
 
 
 //---------------------------------------------------------------------------------
-typedef struct sTransferSound {
-//---------------------------------------------------------------------------------
-  TransferSoundData data[16];
-  u8 count;
-  u8 PADDING[3];
-} TransferSound, * pTransferSound;
+typedef struct {
+	TransferSoundData data[16];
+	u8 count;
+	u8 PADDING[3];
+} TransferSound;
 
 
 
-typedef struct _adpcmBuffer {
+typedef struct {
 	u8 *buffer[8];
 	bool filled[8];
 	u8 *arm7Buffer[8];
@@ -97,7 +95,7 @@ typedef struct scummvmTransferRegion {
   uint16 battery;            // battery life ??  hopefully.  :)
   uint16 aux;                // i have no idea...
 
-  pTransferSound soundData;
+  TransferSound *soundData;
 
   adpcmBuffer adpcm;
 
@@ -127,7 +125,7 @@ typedef struct scummvmTransferRegion {
   // Streaming sound
   bool streamFillNeeded[4];
   int streamPlayingSection;
-} scummTransferRegion, * pscummTransferRegion;
+} scummTransferRegion;
 
 //////////////////////////////////////////////////////////////////////
 
diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index d7c7defa3d..c8002a6204 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -1,5 +1,5 @@
 # To approximate the DS builds A, B, C, ... run our configure like this
-#   configure --host=ds --disable-all-engines OPTIONS
+#   configure --host=ds --disable-translation --disable-all-engines OPTIONS
 # where OPTIONS is...
 # build A:  --enable-scumm
 # build B:  --enable-sky --enable-queen