[Scummvm-cvs-logs] SF.net SVN: scummvm:[49313] scummvm/trunk/backends/platform/ds

[agent-q at users.sourceforge.net]

Revision: 49313
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49313&view=rev
Author:   agent-q
Date:     2010-05-29 20:30:54 +0000 (Sat, 29 May 2010)

Log Message:
-----------
DS: Various fixes to allow the DS port to compile on DevkitARM r30 and libnds 1.4.3.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
    scummvm/trunk/backends/platform/ds/arm9/makefile
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
    scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h

Modified: scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm7/source/main.cpp	2010-05-29 15:47:28 UTC (rev 49312)
+++ scummvm/trunk/backends/platform/ds/arm7/source/main.cpp	2010-05-29 20:30:54 UTC (rev 49313)
@@ -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 @@
   IPC->reset = false;
 
 
- fifoInit();
+ //fifoInit();
 
   for (int r = 0; r < 8; r++) {
 	IPC->adpcm.arm7Buffer[r] = (u8 *) malloc(512);

Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile	2010-05-29 15:47:28 UTC (rev 49312)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile	2010-05-29 20:30:54 UTC (rev 49313)
@@ -75,7 +75,7 @@
 			ifdef DS_BUILD_K
 
 			else
-				USE_MAD = 1
+		#		USE_MAD = 1
 			endif
 		endif
 	endif

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2010-05-29 15:47:28 UTC (rev 49312)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2010-05-29 20:30:54 UTC (rev 49313)
@@ -701,7 +701,7 @@
 
 
 
-	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 @@
 	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++) {

Modified: scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
===================================================================
--- scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h	2010-05-29 15:47:28 UTC (rev 49312)
+++ scummvm/trunk/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h	2010-05-29 20:30:54 UTC (rev 49313)
@@ -33,8 +33,20 @@
 //////////////////////////////////////////////////////////////////////
 
 
+typedef struct sTransferSoundData {
+//---------------------------------------------------------------------------------
+        const void *data;
+        u32 len;
+        u32 rate;
+        u8 vol;
+        u8 pan;
+        u8 format;
+        u8 PADDING;
+} TransferSoundData, * pTransferSoundData;
 
 
+
+
 //---------------------------------------------------------------------------------
 typedef struct sTransferSound {
 //---------------------------------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.