[Scummvm-cvs-logs] SF.net SVN: scummvm: [22657] scummvm/trunk/backends/psp
joostp at users.sourceforge.net
joostp at users.sourceforge.net
Fri May 26 03:48:02 CEST 2006
Revision: 22657
Author: joostp
Date: 2006-05-26 03:46:52 -0700 (Fri, 26 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22657&view=rev
Log Message:
-----------
move psp_fs.cpp from backends/psp/ to backends/fs/psp/
Modified Paths:
--------------
scummvm/trunk/backends/psp/Makefile
Added Paths:
-----------
scummvm/trunk/backends/fs/psp/psp_fs.cpp
Removed Paths:
-------------
scummvm/trunk/backends/psp/psp_fs.cpp
Copied: scummvm/trunk/backends/fs/psp/psp_fs.cpp (from rev 22655, scummvm/trunk/backends/psp/psp_fs.cpp)
===================================================================
--- scummvm/trunk/backends/fs/psp/psp_fs.cpp (rev 0)
+++ scummvm/trunk/backends/fs/psp/psp_fs.cpp 2006-05-26 10:46:52 UTC (rev 22657)
@@ -0,0 +1,187 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2005-2006 The ScummVM project
+ * Copyright (C) 2005 Joost Peters PSP Backend
+ * Copyright (C) 2005 Thomas Mayer PSP Backend
+ * Copyright (C) 2005 Paolo Costabel PSP 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$
+ */
+
+#ifdef __PSP__
+#include "base/engine.h"
+
+#include "backends/fs/abstract-fs.h"
+#include "backends/fs/fs.h"
+
+#include <sys/stat.h>
+#include <unistd.h>
+
+
+/*
+ * Implementation of the ScummVM file system API based on PSPSDK API.
+ */
+
+class PSPFilesystemNode : public AbstractFilesystemNode {
+protected:
+ String _displayName;
+ bool _isDirectory;
+ bool _isValid;
+ bool _isPseudoRoot;
+ String _path;
+
+public:
+ PSPFilesystemNode();
+ PSPFilesystemNode(const String &path);
+ PSPFilesystemNode(const Common::String &p, bool verify);
+
+ virtual String displayName() const { return _displayName; }
+ virtual bool isValid() const { return _isValid; }
+ 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;
+};
+
+AbstractFilesystemNode *AbstractFilesystemNode::getCurrentDirectory() {
+ return AbstractFilesystemNode::getRoot();
+}
+
+AbstractFilesystemNode *AbstractFilesystemNode::getRoot() {
+ return new PSPFilesystemNode();
+}
+
+PSPFilesystemNode::PSPFilesystemNode() {
+ _isDirectory = true;
+ _displayName = "Root";
+ _isValid = true;
+ _path = "ms0:/";
+ _isPseudoRoot = true;
+}
+
+PSPFilesystemNode::PSPFilesystemNode(const Common::String &p) {
+ _displayName = p;
+ _isValid = true;
+ _isDirectory = true;
+ _path = p;
+}
+
+PSPFilesystemNode::PSPFilesystemNode(const Common::String &p, bool verify) {
+ assert(p.size() > 0);
+
+ _path = p;
+ _displayName = _path;
+ _isValid = true;
+ _isDirectory = true;
+
+ if (verify) {
+ struct stat st;
+ _isValid = (0 == stat(_path.c_str(), &st));
+ _isDirectory = S_ISDIR(st.st_mode);
+ }
+}
+
+AbstractFilesystemNode *AbstractFilesystemNode::getNodeForPath(const String &path) {
+ return new PSPFilesystemNode(path);
+}
+
+
+bool PSPFilesystemNode::listDir(AbstractFSList &myList, ListMode mode) const {
+ assert(_isDirectory);
+
+ int dfd = sceIoDopen(_path.c_str());
+ if (dfd > 0) {
+ SceIoDirent dir;
+ memset(&dir, 0, sizeof(dir));
+
+ while (sceIoDread(dfd, &dir) > 0) {
+ // Skip 'invisible files
+ if (dir.d_name[0] == '.')
+ continue;
+
+ PSPFilesystemNode entry;
+
+ entry._isValid = true;
+ entry._isPseudoRoot = false;
+ entry._displayName = dir.d_name;
+ entry._path = _path;
+ entry._path += dir.d_name;
+ entry._isDirectory = dir.d_stat.st_attr & FIO_SO_IFDIR;
+
+ if (entry._isDirectory)
+ entry._path += "/";
+
+ // Honor the chosen mode
+ if ((mode == FilesystemNode::kListFilesOnly && entry._isDirectory) ||
+ (mode == FilesystemNode::kListDirectoriesOnly && !entry._isDirectory))
+ continue;
+
+ myList.push_back(new PSPFilesystemNode(entry));
+ }
+
+ sceIoDclose(dfd);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+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 *PSPFilesystemNode::parent() const {
+ assert(_isValid || _isPseudoRoot);
+ if (_isPseudoRoot)
+ return 0;
+ PSPFilesystemNode *p = new PSPFilesystemNode();
+ if (_path.size() > 5) {
+ const char *start = _path.c_str();
+ const char *end = lastPathComponent(_path);
+
+ p->_path = String(start, end - start);
+ p->_isValid = true;
+ p->_isDirectory = true;
+ p->_displayName = lastPathComponent(p->_path);
+ p->_isPseudoRoot = false;
+ }
+ return p;
+}
+
+AbstractFilesystemNode *PSPFilesystemNode::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;
+ PSPFilesystemNode *p = new PSPFilesystemNode(newPath, true);
+
+ return p;
+}
+
+#endif // PSP
Modified: scummvm/trunk/backends/psp/Makefile
===================================================================
--- scummvm/trunk/backends/psp/Makefile 2006-05-26 10:43:59 UTC (rev 22656)
+++ scummvm/trunk/backends/psp/Makefile 2006-05-26 10:46:52 UTC (rev 22657)
@@ -59,7 +59,7 @@
TARGET = scummvm-psp
OBJS := psp_main.o \
- psp_fs.o \
+ ../fs/psp/psp_fs.o \
osys_psp.o \
osys_psp_gu.o \
kbd_ss_c.o \
Deleted: scummvm/trunk/backends/psp/psp_fs.cpp
===================================================================
--- scummvm/trunk/backends/psp/psp_fs.cpp 2006-05-26 10:43:59 UTC (rev 22656)
+++ scummvm/trunk/backends/psp/psp_fs.cpp 2006-05-26 10:46:52 UTC (rev 22657)
@@ -1,187 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2005-2006 The ScummVM project
- * Copyright (C) 2005 Joost Peters PSP Backend
- * Copyright (C) 2005 Thomas Mayer PSP Backend
- * Copyright (C) 2005 Paolo Costabel PSP 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$
- */
-
-#ifdef __PSP__
-#include "base/engine.h"
-
-#include "backends/fs/abstract-fs.h"
-#include "backends/fs/fs.h"
-
-#include <sys/stat.h>
-#include <unistd.h>
-
-
-/*
- * Implementation of the ScummVM file system API based on PSPSDK API.
- */
-
-class PSPFilesystemNode : public AbstractFilesystemNode {
-protected:
- String _displayName;
- bool _isDirectory;
- bool _isValid;
- bool _isPseudoRoot;
- String _path;
-
-public:
- PSPFilesystemNode();
- PSPFilesystemNode(const String &path);
- PSPFilesystemNode(const Common::String &p, bool verify);
-
- virtual String displayName() const { return _displayName; }
- virtual bool isValid() const { return _isValid; }
- 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;
-};
-
-AbstractFilesystemNode *AbstractFilesystemNode::getCurrentDirectory() {
- return AbstractFilesystemNode::getRoot();
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getRoot() {
- return new PSPFilesystemNode();
-}
-
-PSPFilesystemNode::PSPFilesystemNode() {
- _isDirectory = true;
- _displayName = "Root";
- _isValid = true;
- _path = "ms0:/";
- _isPseudoRoot = true;
-}
-
-PSPFilesystemNode::PSPFilesystemNode(const Common::String &p) {
- _displayName = p;
- _isValid = true;
- _isDirectory = true;
- _path = p;
-}
-
-PSPFilesystemNode::PSPFilesystemNode(const Common::String &p, bool verify) {
- assert(p.size() > 0);
-
- _path = p;
- _displayName = _path;
- _isValid = true;
- _isDirectory = true;
-
- if (verify) {
- struct stat st;
- _isValid = (0 == stat(_path.c_str(), &st));
- _isDirectory = S_ISDIR(st.st_mode);
- }
-}
-
-AbstractFilesystemNode *AbstractFilesystemNode::getNodeForPath(const String &path) {
- return new PSPFilesystemNode(path);
-}
-
-
-bool PSPFilesystemNode::listDir(AbstractFSList &myList, ListMode mode) const {
- assert(_isDirectory);
-
- int dfd = sceIoDopen(_path.c_str());
- if (dfd > 0) {
- SceIoDirent dir;
- memset(&dir, 0, sizeof(dir));
-
- while (sceIoDread(dfd, &dir) > 0) {
- // Skip 'invisible files
- if (dir.d_name[0] == '.')
- continue;
-
- PSPFilesystemNode entry;
-
- entry._isValid = true;
- entry._isPseudoRoot = false;
- entry._displayName = dir.d_name;
- entry._path = _path;
- entry._path += dir.d_name;
- entry._isDirectory = dir.d_stat.st_attr & FIO_SO_IFDIR;
-
- if (entry._isDirectory)
- entry._path += "/";
-
- // Honor the chosen mode
- if ((mode == FilesystemNode::kListFilesOnly && entry._isDirectory) ||
- (mode == FilesystemNode::kListDirectoriesOnly && !entry._isDirectory))
- continue;
-
- myList.push_back(new PSPFilesystemNode(entry));
- }
-
- sceIoDclose(dfd);
- return true;
- } else {
- return false;
- }
-}
-
-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 *PSPFilesystemNode::parent() const {
- assert(_isValid || _isPseudoRoot);
- if (_isPseudoRoot)
- return 0;
- PSPFilesystemNode *p = new PSPFilesystemNode();
- if (_path.size() > 5) {
- const char *start = _path.c_str();
- const char *end = lastPathComponent(_path);
-
- p->_path = String(start, end - start);
- p->_isValid = true;
- p->_isDirectory = true;
- p->_displayName = lastPathComponent(p->_path);
- p->_isPseudoRoot = false;
- }
- return p;
-}
-
-AbstractFilesystemNode *PSPFilesystemNode::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;
- PSPFilesystemNode *p = new PSPFilesystemNode(newPath, true);
-
- return p;
-}
-
-#endif // PSP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list