Fix some more duplicated files, and unify case for rpc include

svn-id: r23459

1 files changed, 0 insertions, 186 deletions

diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp
index bb5e44e722..e7df457490 100644
--- a/backends/platform/ds/arm9/source/gbampsave.cpp
+++ b/backends/platform/ds/arm9/source/gbampsave.cpp
@@ -184,189 +184,3 @@ void GBAMPSaveFileManager::listSavefiles(char const* prefix, bool* marks, int nu
 	
 	FAT_chdir("/");
 }
-/* ScummVMDS - Scumm Interpreter DS Port
- * Copyright (C) 2002-2004 The ScummVM project and Neil Millstone
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#include "gbampsave.h"
-#include "gba_nds_fat.h"
-
-/////////////////////////
-// GBAMP Save File
-/////////////////////////
-
-GBAMPSaveFile::GBAMPSaveFile(char* name, bool saveOrLoad) {
-	handle = DS::std_fopen(name, saveOrLoad? "w": "r");
-	//consolePrintf("%s handle is %d\n", name, handle);
-//	consolePrintf("Created %s\n", name);
-	bufferPos = 0;
-	saveSize = 0;
-	flushed = 0;
-}
-
-GBAMPSaveFile::~GBAMPSaveFile() {
-	flushSaveBuffer();
-	DS::std_fclose(handle);
-}
-
-uint32 GBAMPSaveFile::read(void *buf, uint32 size) {
-	saveSize += size;
-//	consolePrintf("Read %d %d ", size, saveSize);
-	return DS::std_fread(buf, 1, size, handle);
-}
-
-bool GBAMPSaveFile::eos() const {
-	return DS::std_feof(handle);
-}
-
-void GBAMPSaveFile::skip(uint32 bytes) {
-	DS::std_fseek(handle, bytes, SEEK_CUR);
-}
-
-void GBAMPSaveFile::flushSaveBuffer() {
-	if (bufferPos != 0) {
-//		consolePrintf("Flushing %d bytes\n", bufferPos);
-		flushed += bufferPos;
-		DS::std_fwrite(buffer, 1, bufferPos, handle);
-		bufferPos = 0;
-	}
-}
-
-uint32 GBAMPSaveFile::pos() const {
-	return DS::std_ftell(handle);
-}
-
-uint32 GBAMPSaveFile::size() const {
-	int position = pos();
-	DS::std_fseek(handle, 0, SEEK_END);
-	int size = DS::std_ftell(handle);
-	DS::std_fseek(handle, position, SEEK_SET);
-	return size;
-}
-
-void GBAMPSaveFile::seek(int32 pos, int whence) {
-	DS::std_fseek(handle, pos, whence);
-}
-
-
-uint32 GBAMPSaveFile::write(const void *buf, uint32 size) {
-	if (bufferPos + size > SAVE_BUFFER_SIZE) {
-		flushSaveBuffer();
-		saveSize += size;
-		DS::std_fwrite(buf, 1, size, handle);
-/*		int pos = 0;
-		
-		int rest = SAVE_BUFFER_SIZE - bufferPos;
-		memcpy(buffer + bufferPos, buf, rest);
-		bufferPos = 512;
-		pos += rest;
-		flushSaveBuffer();		
-		size -= rest;
-//		consolePrintf("First section: %d\n", rest);
-		
-		while (size >= 512) {
-			DS::std_fwrite(((char *) (buf)) + pos, 1, 512, handle);
-			size -= 512;
-			pos += 512;
-//			consolePrintf("Full chunk, %d left ", size);
-		}
-		
-		bufferPos = 0;
-		memcpy(buffer + bufferPos, ((char *) (buf)) + pos, size);
-		bufferPos += size;
-//		consolePrintf("%d left in buffer ", bufferPos);*/
-		
-	} else {
-	
-		memcpy(buffer + bufferPos, buf, size);
-		bufferPos += size;
-		
-		saveSize += size;
-	}
-	
-//	if ((size > 100) || (size <= 0)) consolePrintf("Write %d bytes\n", size);
-	return size;
-}
-
-
-//////////////////////////
-// GBAMP Save File Manager
-//////////////////////////
-
-GBAMPSaveFileManager::GBAMPSaveFileManager() {
-
-}
-
-GBAMPSaveFileManager::~GBAMPSaveFileManager() {
-
-}
-
-Common::SaveFile* GBAMPSaveFileManager::openSavefile(char const* name, bool saveOrLoad) {
-	char fileSpec[128];
-	
-	strcpy(fileSpec, getSavePath());
-	
-	if (fileSpec[strlen(fileSpec) - 1] == '/') {
-		sprintf(fileSpec, "%s%s", getSavePath(), name);
-	} else {
-		sprintf(fileSpec, "%s/%s", getSavePath(), name);
-	}
-	
-//	consolePrintf(fileSpec);
-
-	return new GBAMPSaveFile(fileSpec, saveOrLoad);
-}
-
-void GBAMPSaveFileManager::listSavefiles(char const* prefix, bool* marks, int num) {
-	enum { TYPE_NO_MORE = 0, TYPE_FILE = 1, TYPE_DIR = 2 };
-	char name[128];
-	char path[128];
-	
-	DS::std_cwd((char *) getSavePath());
-	
-	int fileType = FAT_FindFirstFile(name);
-	
-	for (int r = 0; r < num; r++) {
-		marks[r] = false;
-	}
-	
-	do {
-	
-		if (fileType == TYPE_FILE) {
-
-			FAT_GetLongFilename(name);
-			
-			for (int r = 0; r < num; r++) {
-				char str[128];
-				
-				
-				sprintf(str, "%s%02d", prefix, r);
-//				consolePrintf("%s != %s", str, name);
-				if (!stricmp(str, name)) {
-					marks[r] = true;
-//					consolePrintf("Matched %d", r);
-				}
-				
-			}
-			
-		}
-	
-	} while ((fileType = FAT_FindNextFile(name)));
-	
-	FAT_chdir("/");
-}