[Scummvm-cvs-logs] SF.net SVN: scummvm: [24235] scummvm/branches/branch-0-9-0/backends/ds/arm9 /source/fat

agent-q at users.sourceforge.net agent-q at users.sourceforge.net
Sun Oct 8 23:00:52 CEST 2006


Revision: 24235
          http://svn.sourceforge.net/scummvm/?rev=24235&view=rev
Author:   agent-q
Date:     2006-10-08 14:00:48 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
Changes to initialisation of NinjaDS drivers

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/disc_io.c
    scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/io_njsd.c

Modified: scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/disc_io.c
===================================================================
--- scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/disc_io.c	2006-10-08 20:46:09 UTC (rev 24234)
+++ scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/disc_io.c	2006-10-08 21:00:48 UTC (rev 24235)
@@ -311,16 +311,6 @@
 #endif
 
 
-#ifdef SUPPORT_NJSD
-	// check if we have a GBA Flash Cart plugged in
-	active_interface = NJSD_GetInterface() ;
-	if (active_interface->fn_StartUp())
-	{
-		// set NJSD as default IO
-		return true ;
-	} ;
-#endif
-
 #ifdef SUPPORT_SCSD
 	// check if we have a SuperCard SD plugged in
 	active_interface = SCSD_GetInterface() ;
@@ -349,6 +339,16 @@
 	WAIT_CR |= (1<<11);
 #endif
 
+#ifdef SUPPORT_NJSD
+	// check if we have a GBA Flash Cart plugged in
+	active_interface = NJSD_GetInterface() ;
+	if (active_interface->fn_StartUp())
+	{
+		// set NJSD as default IO
+		return true ;
+	} ;
+#endif
+
 #ifdef SUPPORT_NMMC
 	// check if we have a Neoflash MK2 / MK3 plugged in
 	active_interface = NMMC_GetInterface() ;
@@ -359,6 +359,9 @@
 	} ;
 #endif
 
+
+
+
 	return false;
 }
 #endif

Modified: scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/io_njsd.c
===================================================================
--- scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/io_njsd.c	2006-10-08 20:46:09 UTC (rev 24234)
+++ scummvm/branches/branch-0-9-0/backends/ds/arm9/source/fat/io_njsd.c	2006-10-08 21:00:48 UTC (rev 24235)
@@ -42,7 +42,7 @@
 #include "io_sd_common.h"
 
 #define BYTES_PER_READ 512
-//#define _NJSD_SYNC
+#define _NJSD_SYNC
 // #define _NJSD_DEBUG
 
 //---------------------------------------------------------------


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




More information about the Scummvm-git-logs mailing list