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

[fingolfin at users.sourceforge.net]

Revision: 34546
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34546&view=rev
Author:   fingolfin
Date:     2008-09-14 22:12:59 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
Another NDS compilation fix, plus a warning fix

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp

Modified: scummvm/trunk/backends/platform/ds/arm7/source/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm7/source/main.cpp	2008-09-14 21:41:27 UTC (rev 34545)
+++ scummvm/trunk/backends/platform/ds/arm7/source/main.cpp	2008-09-14 22:12:59 UTC (rev 34546)
@@ -233,7 +233,7 @@
 	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 @@
   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. :-)
 }
 
 /*

Modified: scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp	2008-09-14 21:41:27 UTC (rev 34545)
+++ scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp	2008-09-14 22:12:59 UTC (rev 34546)
@@ -79,7 +79,7 @@
 	return size;
 }
 
-void GBAMPSaveFile::seek(int32 pos, int whence) {
+bool GBAMPSaveFile::seek(int32 pos, int whence) {
 	return DS::std_fseek(handle, pos, whence) == 0;
 }
 


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