* Move gp32-fs.cpp to fs/gp32 dir.

* Fix gp32 launcher code.

svn-id: r23023

7 files changed, 18 insertions, 489 deletions

diff --git a/backends/gp32/Makefile b/backends/gp32/Makefile
index 49e03d4adf..efda74bfe0 100644
--- a/backends/gp32/Makefile
+++ b/backends/gp32/Makefile
@@ -133,7 +133,7 @@ OBJS	+=	backends/gp32/gp32std.o \
 OBJS	+= 	backends/gp32/gp32_main.o \
 			backends/gp32/gp32_launcher.o \
 			backends/gp32/gp32_osys.o \
-			backends/gp32/gp32-fs.o
+			backends/fs/gp32/gp32-fs.o
 
 $(FXE): $(BIN)
 					$(FXETOOL) -f -a "The ScummVM Team" -t "ScummVM for the GP32" $< $@
diff --git a/backends/gp32/gp-fs.cpp b/backends/gp32/gp-fs.cpp
deleted file mode 100644
index fd4e484416..0000000000
--- a/backends/gp32/gp-fs.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
- * Copyright (C) 2002 Ph0x - GP32 Backend
- * Copyright (C) 2003/2004 DJWillis - GP32 Backend
- * Copyright (C) 2005 Won Star - GP32 Backend
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "stdafx.h"
-
-#include "backends/fs/abstract-fs.h"
-#include "backends/fs/fs.h"
-
-class GP32FilesystemNode : public AbstractFilesystemNode {
-protected:
-	String _displayName;
-	bool _isDirectory;
-	bool _isRoot;
-	String _path;
-
-public:
-	GP32FilesystemNode();
-	GP32FilesystemNode(const String &path);
-
-	virtual String displayName() const { return _displayName; }
-	virtual bool isValid() const { return true; }
-	virtual bool isDirectory() const { return _isDirectory; }
-	virtual String path() const { return _path; }
-
-	virtual bool listDir(AbstractFSList &list, ListMode mode) const;
-	virtual AbstractFilesystemNode *parent() const;
-	virtual AbstractFilesystemNode *child(const String &name) const;
-};
-
-#define MAX_PATH_SIZE 256
-
-const char gpRootPath[] = "gp:\\";
-//char gpCurrentPath[MAX_PATH_SIZE] = "gp:\\";		// must end with '\'
-
-int gpMakePath(const char *path, char *convPath) {
-	// copy root or current directory
-	const char *p;
-	if ((*path == '/') || (*path == '\\')) {
-		path++;
-		p = gpRootPath;
-		while (*p)
-			*convPath++ = *p++;
-	}// else
-	//	p = gpCurrentPath;
-
-	//while (*p)
-	//	*convPath++ = *p++;
-
-	// add filenames/directories. remove "." & "..", replace "/" with "\"
-	do {
-		switch (*path) {
-		case 0:
-		case '/':
-		case '\\':
-			if (*(convPath - 1) == '\\') {
-				// already ends with '\'
-			} else if ((*(convPath - 2) == '\\') && (*(convPath - 1) == '.')) {
-				convPath--;	// remove '.' and end with '\'
-			} else if ((*(convPath - 3) == '\\') && (*(convPath - 2) == '.') && (*(convPath - 1) == '.')) {
-				convPath -= 3;	// remove "\.."
-				if (*(convPath - 1) == ':')
-					*convPath++ = '\\';	// "gp:" -> "gp:\"
-				else
-					while (*(convPath - 1) != '\\')
-						convPath--;	// remove one directory and end with '\'
-			} else {
-				*convPath++ = '\\';	// just add '\'
-			}
-			break;
-
-		default:
-			*convPath++ = *path;
-			break;
-		}
-	} while (*path++);
-
-	*convPath = '\\';
-
-	//  *--convPath = 0;	// remove last '\' and null-terminate
-	*convPath = 0;	// remove last '\' and null-terminate
-
-	return 0;
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getCurrentDirectory() {
-	return AbstractFilesystemNode::getRoot();
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getRoot() {
-	return new GP32FilesystemNode();
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getNodeForPath(const String &path) {
-	return new GP32FilesystemNode(path);
-}
-
-GP32FilesystemNode::GP32FilesystemNode() {
-	_isDirectory = true;
-	_isRoot = true;
-	_displayName = "GP32 Root";
-	_path = "gp:\\";
-}
-
-GP32FilesystemNode::GP32FilesystemNode(const String &path) {
-	const char *dsplName = NULL, *pos = NULL;
-	char convPath[256];
-
-	gpMakePath(path.c_str(), convPath);
-
-	_path = convPath;
-
-	pos = convPath;
-	while (*pos)
-		if (*pos++ == '\\')
-			dsplName = pos;
-
-	BP("FS: path name: %s", path.c_str());
-
-	if (strcmp(path.c_str(), "gp:\\") == 0) {
-		_isRoot = true;
-		_displayName = "GP32 Root";
-	} else {
-		_displayName = String(dsplName);
-	}
-	_isDirectory = true;
-}
-
-bool GP32FilesystemNode::listDir(AbstractFSList &myList, ListMode mode) const {
-	assert(_isDirectory);
-
-	GPDIRENTRY dirEntry;
-	GPFILEATTR attr;
-
-	GP32FilesystemNode entry;
-
-	uint32 read;
-
-	if (mode == FilesystemNode::kListAll)
-		LP("listDir(kListAll)");
-	else
-		LP("listDir(kListDirectoriesOnly)");
-
-	int startIdx = 0; // current file
-	String listDir(_path);
-	//listDir += "/";
-	while (GpDirEnumList(listDir.c_str(), startIdx++, 1, &dirEntry, &read)  == SM_OK) {
-		if (dirEntry.name[0] == '.')
-			continue;
-		entry._displayName = dirEntry.name;
-		entry._path = _path;
-		entry._path += dirEntry.name;
-
-		GpFileAttr(entry._path.c_str(), &attr);
-		entry._isDirectory = attr.attr & (1 << 4);
-
-		// Honor the chosen mode
-		if ((mode == FilesystemNode::kListFilesOnly && entry._isDirectory) ||
-			(mode == FilesystemNode::kListDirectoriesOnly && !entry._isDirectory))
-			continue;
-
-		if (entry._isDirectory)
-			entry._path += "\\";
-		myList.push_back(new GP32FilesystemNode(entry));
-	}
-
-	BP("Dir... %s", listDir.c_str());
-
-	return true;
-}
-
-const char *lastPathComponent(const Common::String &str) {
-	const char *start = str.c_str();
-	const char *cur = start + str.size() - 2;
-
-	while (cur > start && *cur != '\\') {
-		--cur;
-	}
-
-	return cur + 1;
-}
-
-AbstractFilesystemNode *GP32FilesystemNode::parent() const {
-	if(_isRoot)
-		return 0;
-
-	GP32FilesystemNode *p = new GP32FilesystemNode();
-	if (_path.size() > 4) {
-		const char *start = _path.c_str();
-		const char *end = lastPathComponent(_path);
-
-		p->_path = String(start, end - start);
-		p->_isDirectory = true;
-		p->_displayName = lastPathComponent(p->_path);
-		p->_isRoot = false;
-	}
-
-	return p;
-}
-
-AbstractFilesystemNode *GP32FilesystemNode::child(const String &name) const {
-	// FIXME: Pretty lame implementation! We do no error checking to speak
-	// of, do not check if this is a special node, etc.
-	assert(_isDirectory);
-	String newPath(_path);
-	if (_path.lastChar() != '\\')
-		newPath += '\\';
-	newPath += name;
-	GP32FilesystemNode *p = new GP32FilesystemNode(newPath);
-
-	return p;
-}
diff --git a/backends/gp32/gp32-fs.cpp b/backends/gp32/gp32-fs.cpp
deleted file mode 100644
index 41900f71f6..0000000000
--- a/backends/gp32/gp32-fs.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
- * Copyright (C) 2002 Ph0x - GP32 Backend
- * Copyright (C) 2003/2004 DJWillis - GP32 Backend
- * Copyright (C) 2005 Won Star - GP32 Backend
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "stdafx.h"
-
-#include "backends/fs/abstract-fs.h"
-#include "backends/fs/fs.h"
-
-class GP32FilesystemNode : public AbstractFilesystemNode {
-protected:
-	String _displayName;
-	bool _isDirectory;
-	bool _isRoot;
-	String _path;
-
-public:
-	GP32FilesystemNode();
-	GP32FilesystemNode(const String &path);
-
-	virtual String displayName() const { return _displayName; }
-	virtual bool isValid() const { return true; }
-	virtual bool isDirectory() const { return _isDirectory; }
-	virtual String path() const { return _path; }
-
-	virtual bool listDir(AbstractFSList &list, ListMode mode) const;
-	virtual AbstractFilesystemNode *parent() const;
-	virtual AbstractFilesystemNode *child(const String &name) const;
-};
-
-#define MAX_PATH_SIZE 256
-
-const char gpRootPath[] = "gp:\\";
-//char gpCurrentPath[MAX_PATH_SIZE] = "gp:\\";		// must end with '\'
-
-int gpMakePath(const char *path, char *convPath) {
-	// copy root or current directory
-	const char *p;
-	if ((*path == '/') || (*path == '\\')) {
-		path++;
-		p = gpRootPath;
-		while (*p)
-			*convPath++ = *p++;
-	}// else
-	//	p = gpCurrentPath;
-
-	//while (*p)
-	//	*convPath++ = *p++;
-
-	// add filenames/directories. remove "." & "..", replace "/" with "\"
-	do {
-		switch (*path) {
-		case 0:
-		case '/':
-		case '\\':
-			if (*(convPath - 1) == '\\') {
-				// already ends with '\'
-			} else if ((*(convPath - 2) == '\\') && (*(convPath - 1) == '.')) {
-				convPath--;	// remove '.' and end with '\'
-			} else if ((*(convPath - 3) == '\\') && (*(convPath - 2) == '.') && (*(convPath - 1) == '.')) {
-				convPath -= 3;	// remove "\.."
-				if (*(convPath - 1) == ':')
-					*convPath++ = '\\';	// "gp:" -> "gp:\"
-				else
-					while (*(convPath - 1) != '\\')
-						convPath--;	// remove one directory and end with '\'
-			} else {
-				*convPath++ = '\\';	// just add '\'
-			}
-			break;
-
-		default:
-			*convPath++ = *path;
-			break;
-		}
-	} while (*path++);
-
-	*convPath = '\\';
-
-	//  *--convPath = 0;	// remove last '\' and null-terminate
-	*convPath = 0;	// remove last '\' and null-terminate
-
-	return 0;
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getCurrentDirectory() {
-	return AbstractFilesystemNode::getRoot();
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getRoot() {
-	return new GP32FilesystemNode();
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getNodeForPath(const String &path) {
-	return new GP32FilesystemNode(path);
-}
-
-GP32FilesystemNode::GP32FilesystemNode() {
-	_isDirectory = true;
-	_isRoot = true;
-	_displayName = "GP32 Root";
-	_path = "gp:\\";
-}
-
-GP32FilesystemNode::GP32FilesystemNode(const String &path) {
-	const char *dsplName = NULL, *pos = NULL;
-	char convPath[256];
-
-	gpMakePath(path.c_str(), convPath);
-
-	_path = convPath;
-
-	pos = convPath;
-	while (*pos)
-		if (*pos++ == '\\')
-			dsplName = pos;
-
-	BP("FS: path name: %s", path.c_str());
-
-	if (strcmp(path.c_str(), "gp:\\") == 0) {
-		_isRoot = true;
-		_displayName = "GP32 Root";
-	} else {
-		_displayName = String(dsplName);
-	}
-	_isDirectory = true;
-}
-
-bool GP32FilesystemNode::listDir(AbstractFSList &myList, ListMode mode) const {
-	assert(_isDirectory);
-
-	GPDIRENTRY dirEntry;
-	GPFILEATTR attr;
-
-	GP32FilesystemNode entry;
-
-	uint32 read;
-
-	if (mode == FilesystemNode::kListAll)
-		LP("listDir(kListAll)");
-	else
-		LP("listDir(kListDirectoriesOnly)");
-
-	int startIdx = 0; // current file
-	String listDir(_path);
-	//listDir += "/";
-	while (GpDirEnumList(listDir.c_str(), startIdx++, 1, &dirEntry, &read)  == SM_OK) {
-		if (dirEntry.name[0] == '.')
-			continue;
-		entry._displayName = dirEntry.name;
-		entry._path = _path;
-		entry._path += dirEntry.name;
-
-		GpFileAttr(entry._path.c_str(), &attr);
-		entry._isDirectory = attr.attr & (1 << 4);
-
-		// Honor the chosen mode
-		if ((mode == FilesystemNode::kListFilesOnly && entry._isDirectory) ||
-			(mode == FilesystemNode::kListDirectoriesOnly && !entry._isDirectory))
-			continue;
-
-		if (entry._isDirectory)
-			entry._path += "\\";
-		myList.push_back(new GP32FilesystemNode(entry));
-	}
-
-	BP("Dir... %s", listDir.c_str());
-
-	return true;
-}
-
-const char *lastPathComponent(const Common::String &str) {
-	const char *start = str.c_str();
-	const char *cur = start + str.size() - 2;
-
-	while (cur > start && *cur != '\\') {
-		--cur;
-	}
-
-	return cur + 1;
-}
-
-AbstractFilesystemNode *GP32FilesystemNode::parent() const {
-	if(_isRoot)
-		return 0;
-
-	GP32FilesystemNode *p = new GP32FilesystemNode();
-	if (_path.size() > 4) {
-		const char *start = _path.c_str();
-		const char *end = lastPathComponent(_path);
-
-		p->_path = String(start, end - start);
-		p->_isDirectory = true;
-		p->_displayName = lastPathComponent(p->_path);
-		p->_isRoot = false;
-		
-		GPDEBUG("%s", p->_path.c_str());
-	}
-
-	return p;
-}
-
-AbstractFilesystemNode *GP32FilesystemNode::child(const String &name) const {
-	// FIXME: Pretty lame implementation! We do no error checking to speak
-	// of, do not check if this is a special node, etc.
-	assert(_isDirectory);
-	String newPath(_path);
-	if (_path.lastChar() != '\\')
-		newPath += '\\';
-	newPath += name;
-	GP32FilesystemNode *p = new GP32FilesystemNode(newPath);
-
-	return p;
-}
diff --git a/backends/gp32/gp32_launcher.cpp b/backends/gp32/gp32_launcher.cpp
index b9f7bfe717..c7061590d2 100644
--- a/backends/gp32/gp32_launcher.cpp
+++ b/backends/gp32/gp32_launcher.cpp
@@ -64,26 +64,23 @@ void writeConfigVars() {
 
 void readConfigVars() {
 	Common::File file;
-	if (!file.exists("gp:\\gpetc\\scummvm.cfg")) {
+	if (!file.open("gp:\\gpetc\\scummvm.cfg", Common::File::kFileReadMode)) {
 		currentSetting[0] = 2;
 		currentSetting[1] = 5;
 		currentSetting[2] = 1;
 		currentSetting[3] = 1;
 		writeConfigVars();
-	} else {
-		if (!file.open("gp:\\gpetc\\scummvm.cfg", Common::File::kFileReadMode)) {
-			return;
-		}
-		currentSetting[0] = file.readByte();
-		currentSetting[1] = file.readByte();
-		currentSetting[2] = file.readByte();
-		currentSetting[3] = file.readByte();
-		g_vars.cpuSpeed = cpuSpeedTable[currentSetting[0]];
-		g_vars.gammaRamp = gammaTable[currentSetting[1]];
-		g_vars.fmQuality = currentSetting[2];
-		g_vars.sampleRate = sampleTable[currentSetting[3]];
-		file.close();
+		return;
 	}
+	currentSetting[0] = file.readByte();
+	currentSetting[1] = file.readByte();
+	currentSetting[2] = file.readByte();
+	currentSetting[3] = file.readByte();
+	g_vars.cpuSpeed = cpuSpeedTable[currentSetting[0]];
+	g_vars.gammaRamp = gammaTable[currentSetting[1]];
+	g_vars.fmQuality = currentSetting[2];
+	g_vars.sampleRate = sampleTable[currentSetting[3]];
+	file.close();
 }
 
 void configMenu() {
@@ -137,12 +134,12 @@ void configMenu() {
 				currentSelect++;
 		}
 		if (gpd_getButtonDown(nKeyUD, GPC_VK_LEFT)) {
-			if (currentSelect <= 3)
+			if (currentSelect <= 4)
 				if (currentSetting[currentSelect] > 0)
 					currentSetting[currentSelect]--;
 		}
 		if (gpd_getButtonDown(nKeyUD, GPC_VK_RIGHT)) {
-			if (currentSelect <= 3)
+			if (currentSelect <= 4)
 				if (currentSetting[currentSelect] < maxTable[currentSelect] - 1)
 					currentSetting[currentSelect]++;
 		}
diff --git a/backends/gp32/gp32_osys.cpp b/backends/gp32/gp32_osys.cpp
index a52472edfd..68adfb3576 100644
--- a/backends/gp32/gp32_osys.cpp
+++ b/backends/gp32/gp32_osys.cpp
@@ -114,6 +114,8 @@ void OSystem_GP32::initSize(uint width, uint height) {
 
 	_overlayWidth = width;
 	_overlayHeight = height;
+//	_overlayWidth = 320;
+//	_overlayHeight = 240;
 
 	// Create the surface that contains the 8 bit game data
 	_gameScreen = new uint8[_screenWidth * _screenHeight];
@@ -345,12 +347,10 @@ void OSystem_GP32::copyRectToOverlay(const OverlayColor *buf, int pitch, int x,
 }
 
 int16 OSystem_GP32::getOverlayHeight() {
-	//NP("OSys::getOverlayHeight()");
 	return getHeight();
 }
 
 int16 OSystem_GP32::getOverlayWidth() {
-	//NP("OSys::getOverlayWidth()");
 	return getWidth();
 }
 
diff --git a/backends/gp32/gp32std.cpp b/backends/gp32/gp32std.cpp
index 5622f4d465..2a7f06177d 100644
--- a/backends/gp32/gp32std.cpp
+++ b/backends/gp32/gp32std.cpp
@@ -328,7 +328,7 @@ static char usedMemStr[16];
 int gUsedMem = 1024 * 1024;
 
 //#define CLEAN_MEMORY_WITH_0xE7
-//#define CHECK_USED_MEMORY
+#define CHECK_USED_MEMORY
 #define CHECK_NEW_TIME
 
 void *operator new(size_t size) {
diff --git a/backends/gp32/gp32std_input.cpp b/backends/gp32/gp32std_input.cpp
index 28d7acbf01..99c1329eae 100644
--- a/backends/gp32/gp32std_input.cpp
+++ b/backends/gp32/gp32std_input.cpp
@@ -200,7 +200,7 @@ bool gp_pollButtonEvent(GP32BtnEvent *ev) {
 	}
 
 	eventQueue.get(ev);
-	GPDEBUG("Event poll %d %d", ev->type, ev->button);
+//	GPDEBUG("Event poll %d %d", ev->type, ev->button);
 
 	return true;
 }