[Scummvm-cvs-logs] SF.net SVN: scummvm:[46105] scummvm/trunk/backends

[fingolfin at users.sourceforge.net]

Revision: 46105
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46105&view=rev
Author:   fingolfin
Date:     2009-11-23 22:28:44 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
PS2: cleanup

Modified Paths:
--------------
    scummvm/trunk/backends/fs/stdiostream.cpp
    scummvm/trunk/backends/platform/ps2/DmaPipe.cpp
    scummvm/trunk/backends/platform/ps2/DmaPipe.h
    scummvm/trunk/backends/platform/ps2/fileio.cpp
    scummvm/trunk/backends/platform/ps2/fileio.h

Modified: scummvm/trunk/backends/fs/stdiostream.cpp
===================================================================
--- scummvm/trunk/backends/fs/stdiostream.cpp	2009-11-23 22:28:14 UTC (rev 46104)
+++ scummvm/trunk/backends/fs/stdiostream.cpp	2009-11-23 22:28:44 UTC (rev 46105)
@@ -29,8 +29,6 @@
 
 #ifdef __PLAYSTATION2__
 	// for those replaced fopen/fread/etc functions
-	typedef unsigned long	uint64;
-	typedef signed long	int64;
 	#include "backends/platform/ps2/fileio.h"
 
 	#define fopen(a, b)			ps2_fopen(a, b)

Modified: scummvm/trunk/backends/platform/ps2/DmaPipe.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/DmaPipe.cpp	2009-11-23 22:28:14 UTC (rev 46104)
+++ scummvm/trunk/backends/platform/ps2/DmaPipe.cpp	2009-11-23 22:28:44 UTC (rev 46105)
@@ -27,8 +27,8 @@
 
 #include <kernel.h>
 #include <malloc.h>
-#include "DmaPipe.h"
-#include "GsDefs.h"
+#include "backends/platform/ps2/DmaPipe.h"
+#include "backends/platform/ps2/GsDefs.h"
 
 class SinglePipe {
 public:

Modified: scummvm/trunk/backends/platform/ps2/DmaPipe.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/DmaPipe.h	2009-11-23 22:28:14 UTC (rev 46104)
+++ scummvm/trunk/backends/platform/ps2/DmaPipe.h	2009-11-23 22:28:44 UTC (rev 46105)
@@ -28,7 +28,7 @@
 #ifndef __DMAPIPE_H__
 #define __DMAPIPE_H__
 
-#include "sysdefs.h"
+#include "backends/platform/ps2/sysdefs.h"
 #include "backends/platform/ps2/GsDefs.h"
 
 class SinglePipe;

Modified: scummvm/trunk/backends/platform/ps2/fileio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/fileio.cpp	2009-11-23 22:28:14 UTC (rev 46104)
+++ scummvm/trunk/backends/platform/ps2/fileio.cpp	2009-11-23 22:28:44 UTC (rev 46105)
@@ -30,25 +30,17 @@
 #include <fileio.h>
 #include <assert.h>
 #include <string.h>
-#include "backends/platform/ps2/asyncfio.h"
-#include "engines/engine.h"
-#include "common/file.h"
-#include "eecodyvdfs.h"
+
 #include "common/config-manager.h"
+#include "common/file.h"
+#include "engines/engine.h"
+#include "backends/platform/ps2/asyncfio.h"
+#include "backends/platform/ps2/eecodyvdfs.h"
 #include "backends/platform/ps2/ps2debug.h"
 #include "backends/platform/ps2/systemps2.h"
 
 #define __PS2_FILE_SEMA__ 1
-// #define __PS2_FILE_DEBUG 1
-// #define __PS2_CACHE_DEBUG__ 1
 
-#define PS2_CACHE_MAX (128 * 1024)
-#define PS2_CACHE_CHK (16 * 1024)
-
-extern OSystem_PS2 *g_systemPs2;
-
-uint32 _rseek;
-
 AsyncFio fio;
 
 Ps2File::Ps2File(void) {
@@ -60,8 +52,6 @@
 	_eof = false;
 	_err = false;
 
-	// _cache = (uint8 *)malloc(PS2_CACHE_MAX);
-
 	_cacheBuf = (uint8*)memalign(64, CACHE_SIZE * 2);
 
 	_cacheOpRunning = 0;
@@ -96,7 +86,6 @@
 		printf("close [%d] - sync'd = %d\n", _fd, r);
 	}
 
-	// free(_cache);
 	free(_cacheBuf);
 
 #ifdef __PS2_FILE_SEMA__
@@ -237,7 +226,6 @@
 #ifdef __PS2_FILE_SEMA__
 	WaitSema(_sema);
 #endif
-	_rseek = 0;
 	int seekDest;
 	int res = -1;
 	switch (origin) {
@@ -255,7 +243,7 @@
 			break;
 	}
 	if ((seekDest >= 0) && (seekDest <= (int)_fileSize)) {
-		// _rseek = fio.sync(_fd);
+		// uint32 _rseek = fio.sync(_fd);
 		_filePos = seekDest;
 		// fio.seek(_fd, _filePos, SEEK_SET);
 		// fio.sync(_fd);

Modified: scummvm/trunk/backends/platform/ps2/fileio.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/fileio.h	2009-11-23 22:28:14 UTC (rev 46104)
+++ scummvm/trunk/backends/platform/ps2/fileio.h	2009-11-23 22:28:44 UTC (rev 46105)
@@ -26,22 +26,21 @@
 #ifndef __PS2FILE_IO__
 #define __PS2FILE_IO__
 
-typedef unsigned long uint64;
-typedef signed long   int64;
-
 #include <stdio.h>
 #include "common/scummsys.h"
 
+enum {
+	CACHE_SIZE				= 2048 * 32,
+	MAX_READ_STEP			= 2048 * 16,
+	MAX_CACHED_FILES		= 6,
+	CACHE_READ_THRESHOLD	= 16 * 2048,
+	CACHE_FILL_MIN			= 2048 * 24,
+	READ_ALIGN				= 64,   // align all reads to the size of an EE cache line
+	READ_ALIGN_MASK			= READ_ALIGN - 1
+};
 
-#define CACHE_SIZE (2048 * 32)
-#define MAX_READ_STEP (2048 * 16)
-#define MAX_CACHED_FILES 6
-#define CACHE_READ_THRESHOLD (16 * 2048)
-#define CACHE_FILL_MIN (2048 * 24)
-#define READ_ALIGN 64   // align all reads to the size of an EE cache line
-#define READ_ALIGN_MASK (READ_ALIGN - 1)
-
-
+// TODO: Make this a subclass of SeekableReadStream & WriteStream
+// See also StdioStream.
 class Ps2File {
 public:
 	Ps2File(void);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.