Updating DS port for changes in main codebase. Code changes for DevkitArm r20 and latest libnds.

svn-id: r26394

2 files changed, 5 insertions, 5 deletions

diff --git a/backends/platform/ds/arm7/Makefile b/backends/platform/ds/arm7/Makefile
index 5c62d7df58..847b6eea5a 100644
--- a/backends/platform/ds/arm7/Makefile
+++ b/backends/platform/ds/arm7/Makefile
@@ -68,7 +68,7 @@ endif
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:=	$(DEVKITPRO)/libnds $(DEVKITPRO)/libnds/nds
+LIBDIRS	:=	/home/neil/devkitpro/libnds home/neil/devkitpro/libnds/nds
  
  
 #---------------------------------------------------------------------------------
diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp
index d36b038e05..e3ecd30fe4 100644
--- a/backends/platform/ds/arm7/source/main.cpp
+++ b/backends/platform/ds/arm7/source/main.cpp
@@ -25,7 +25,7 @@
 // -- modified by Darkain and others
 //////////////////////////////////////////////////////////////////////
 
-#define USE_LIBCARTRESET
+//#define USE_LIBCARTRESET
  
 #include <nds.h>
  
@@ -424,7 +424,6 @@ void InterruptTimer3() {
     uint32 temp=0;
     uint8 ct[sizeof(IPC->curtime)];
 	static int heartbeat = 0;
-    
     // Update the heartbeat
     heartbeat++;
  
@@ -512,8 +511,7 @@ void InterruptTimer3() {
  #ifdef USE_DEBUGGER
     Wifi_Update(); // update wireless in vblank
  #endif
- }
- 
+} 
 
 //////////////////////////////////////////////////////////////////////
 
@@ -571,6 +569,7 @@ void reboot() {
 
 
 int main(int argc, char ** argv) {
+
 	
 #ifdef USE_DEBUGGER
   REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_SEND_CLEAR;
@@ -639,6 +638,7 @@ int main(int argc, char ** argv) {
 	if (IPC->reset) {
 		powerOff();
 	}
+
 	swiWaitForVBlank();
   }
   return 0;