aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Horn2008-09-14 22:12:59 +0000
committerMax Horn2008-09-14 22:12:59 +0000
commit3c63c8688def0ae4aa0dfd7815b635a6c40ca750 (patch)
tree8340864246a911fe18fe5aecae06aee5141c2671 /backends
parenta4830d813eea7952423338994f0dadf7841a7ada (diff)
downloadscummvm-rg350-3c63c8688def0ae4aa0dfd7815b635a6c40ca750.tar.gz
scummvm-rg350-3c63c8688def0ae4aa0dfd7815b635a6c40ca750.tar.bz2
scummvm-rg350-3c63c8688def0ae4aa0dfd7815b635a6c40ca750.zip
Another NDS compilation fix, plus a warning fix
svn-id: r34546
Diffstat (limited to 'backends')
-rw-r--r--backends/platform/ds/arm7/source/main.cpp5
-rw-r--r--backends/platform/ds/arm9/source/gbampsave.cpp2
2 files changed, 2 insertions, 5 deletions
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. :-)
}
/*
diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp
index 8209b783fa..ed45d02b1e 100644
--- a/backends/platform/ds/arm9/source/gbampsave.cpp
+++ b/backends/platform/ds/arm9/source/gbampsave.cpp
@@ -79,7 +79,7 @@ int32 GBAMPSaveFile::size() const {
return size;
}
-void GBAMPSaveFile::seek(int32 pos, int whence) {
+bool GBAMPSaveFile::seek(int32 pos, int whence) {
return DS::std_fseek(handle, pos, whence) == 0;
}