From 3c63c8688def0ae4aa0dfd7815b635a6c40ca750 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 14 Sep 2008 22:12:59 +0000
Subject: Another NDS compilation fix, plus a warning fix

svn-id: r34546
---
 backends/platform/ds/arm7/source/main.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'backends/platform/ds/arm7')

diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp
index bee39f1efe..d252ed44de 100644
--- a/backends/platform/ds/arm7/source/main.cpp
+++ b/backends/platform/ds/arm7/source/main.cpp
@@ -233,7 +233,7 @@ void DummyHandler() {
 	REG_IF = REG_IF;
 }
 
-uint16 powerManagerWrite(uint32 command, u32 data, bool enable) {
+void powerManagerWrite(uint32 command, u32 data, bool enable) {
 
   uint16 result;
   SerialWaitBusy();
@@ -261,9 +261,6 @@ uint16 powerManagerWrite(uint32 command, u32 data, bool enable) {
   REG_SPICNT = SPI_ENABLE | SPI_BAUD_1MHz;
   REG_SPIDATA = enable? (result | data): (result & ~data);
   SerialWaitBusy();
-  
-  // FIXME: This function should either return something, or have a comment
-  // explaining why it is valid for it to not return something. :-)
 }
 
 /*
-- 
cgit v1.2.3


From a7076b1f89175b9092ef3962cfe8f4b10ee5b633 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 14 Sep 2008 22:15:13 +0000
Subject: NDS: Replaced -I- by modern -iquote

svn-id: r34547
---
 backends/platform/ds/arm7/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform/ds/arm7')

diff --git a/backends/platform/ds/arm7/Makefile b/backends/platform/ds/arm7/Makefile
index 55db7f8cad..82637845db 100644
--- a/backends/platform/ds/arm7/Makefile
+++ b/backends/platform/ds/arm7/Makefile
@@ -107,7 +107,7 @@ MAPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.map)))
 export OFILES	:=	$(MAPFILES:.map=.o) $(RAWFILES:.raw=.o) $(PALFILES:.pal=.o) $(BINFILES:.bin=.o) $(PCXFILES:.pcx=.o)\
 					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
 
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) -I- -I$(CURDIR)/../commoninclude\
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) -Iquote -I$(CURDIR)/../commoninclude\
 					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
 					$(foreach dir,$(LIBDIRS),-I$(dir)/include/nds)\
 					-I$(CURDIR)/$(BUILD) -I$(CURDIR)/source/libcartreset
-- 
cgit v1.2.3