From 655ce26b3f09628d9408a4d82efe3a26116999fe Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 13 Sep 2008 16:51:46 +0000
Subject: Big patch changing the signature of various Stream methods (some
 ports may need to be slightly tweaked to fix overloading errors/warnings)

svn-id: r34514
---
 backends/platform/ds/arm9/source/ramsave.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'backends/platform/ds/arm9/source/ramsave.cpp')

diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp
index be355ce76f..8442fd6b88 100644
--- a/backends/platform/ds/arm9/source/ramsave.cpp
+++ b/backends/platform/ds/arm9/source/ramsave.cpp
@@ -181,15 +181,15 @@ uint32 DSSaveFile::read(void *buf, uint32 size) {
 	return size;
 }
 
-uint32 DSSaveFile::pos() const {
+int32 DSSaveFile::pos() const {
 	return ptr;
 }
 
-uint32 DSSaveFile::size() const {
+int32 DSSaveFile::size() const {
 	return save.size;
 }
 
-void DSSaveFile::seek(int32 pos, int whence) {
+bool DSSaveFile::seek(int32 pos, int whence) {
 	switch (whence) {
 		case SEEK_SET: {
 			ptr = pos;
@@ -204,15 +204,17 @@ void DSSaveFile::seek(int32 pos, int whence) {
 			break;
 		}
 	}
+	return true;
 }
 
 bool DSSaveFile::eos() const {
 	return ptr >= (int) save.size;
 }
 
-void DSSaveFile::skip(uint32 bytes) {
+bool DSSaveFile::skip(uint32 bytes) {
 	ptr = ptr + bytes;
 	if (ptr > (int) save.size) ptr = save.size;
+	return true;
 }
 
 uint32 DSSaveFile::write(const void *buf, uint32 size) {
-- 
cgit v1.2.3


From c8eeae8d4dffa5849a23cf963884027a7789504b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 14 Sep 2008 22:28:53 +0000
Subject: Big patch changing semantics of ReadStream::eos(): eos() now only
 returns true _after_ trying to read past the end of the stream.

This has a large potential for regressions. Please test!

svn-id: r34549
---
 backends/platform/ds/arm9/source/ramsave.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'backends/platform/ds/arm9/source/ramsave.cpp')

diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp
index 8442fd6b88..30c3a06721 100644
--- a/backends/platform/ds/arm9/source/ramsave.cpp
+++ b/backends/platform/ds/arm9/source/ramsave.cpp
@@ -64,6 +64,7 @@ DSSaveFile::DSSaveFile(SCUMMSave* s, bool compressed, u8* data) {
 	}
 	
 	isTempFile = false;
+	eosReached = false;
 }
 
 DSSaveFile::~DSSaveFile() {
@@ -167,11 +168,13 @@ int DSSaveFile::saveToSaveRAM(vu8* address) {
 
 void DSSaveFile::reset() {
 	ptr = 0;
+	eosReached = false;
 }
 
 uint32 DSSaveFile::read(void *buf, uint32 size) {
 	if (ptr + size > save.size) {
 		size = save.size - ptr;
+		eosReached = true;
 		if (size < 0) size = 0;
 	}
 	memcpy(buf, saveData + ptr, size);
@@ -204,11 +207,16 @@ bool DSSaveFile::seek(int32 pos, int whence) {
 			break;
 		}
 	}
+	eosReached = false;
 	return true;
 }
 
 bool DSSaveFile::eos() const {
-	return ptr >= (int) save.size;
+	return eosReached;
+}
+
+void DSSaveFile::clearErr() {
+	eosReached = false;
 }
 
 bool DSSaveFile::skip(uint32 bytes) {
-- 
cgit v1.2.3


From 05d78c26b442bccc1d1e773591900ad0d2087278 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 15 Sep 2008 22:43:20 +0000
Subject: DS: Backported 0.12 changes to trunk

svn-id: r34568
---
 backends/platform/ds/arm9/source/ramsave.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'backends/platform/ds/arm9/source/ramsave.cpp')

diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp
index 30c3a06721..a9f4e3d2fc 100644
--- a/backends/platform/ds/arm9/source/ramsave.cpp
+++ b/backends/platform/ds/arm9/source/ramsave.cpp
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  * 
  */
- // Save in order 1,2,3,4,larger 2,5
+#ifdef GBA_SRAM_SAVE
+
+
 #include "ramsave.h"
 #include "nds.h"
 #include "compressor/lz.h"
@@ -237,7 +239,7 @@ uint32 DSSaveFile::write(const void *buf, uint32 size) {
 	return size;
 }
 
-bool DSSaveFile::matches(char* prefix, int num) {
+bool DSSaveFile::matches(const char *prefix, int num) {
 	char str[16];
 	if (isValid()) {
 		sprintf(str, "%s%02d", prefix, num);
@@ -251,7 +253,7 @@ bool DSSaveFile::matches(char* prefix, int num) {
 	}
 }
 
-bool DSSaveFile::matches(char* filename) {
+bool DSSaveFile::matches(const char *filename) {
 	if (isValid()) {
 		return !strcmp(save.name, filename);
 	} else {
@@ -532,3 +534,5 @@ int DSSaveFileManager::getExtraData() {
 		return 0;
 	}
 }
+
+#endif
-- 
cgit v1.2.3