[Scummvm-cvs-logs] CVS: scummvm/backends/ps2 Gs2dScreen.cpp,1.5.2.3,1.5.2.4 GsDefs.h,1.4.2.2,1.4.2.3 READ_PS2.TXT,1.1.2.2,1.1.2.3 systemps2.cpp,1.8.2.3,1.8.2.4 systemps2.h,1.7.2.3,1.7.2.4

Robert Göffringmann lavosspawn at users.sourceforge.net
Fri Nov 11 23:20:01 CET 2005


Update of /cvsroot/scummvm/scummvm/backends/ps2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19872/backends/ps2

Modified Files:
      Tag: branch-0-8-0
	Gs2dScreen.cpp GsDefs.h READ_PS2.TXT systemps2.cpp systemps2.h 
Log Message:
ps2 fixes, this is RC2 now.

Index: Gs2dScreen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/Gs2dScreen.cpp,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- Gs2dScreen.cpp	9 Nov 2005 19:45:00 -0000	1.5.2.3
+++ Gs2dScreen.cpp	12 Nov 2005 07:19:46 -0000	1.5.2.4
@@ -60,7 +60,7 @@
 static GsVertex kFullScreen[2];
 static TexVertex kMouseTex[2] = {
 	{ SCALE(1), SCALE(1) },
-	{ SCALE(M_SIZE), SCALE(M_SIZE) }
+	{ SCALE(M_SIZE - 1), SCALE(M_SIZE - 1) }
 };
 static TexVertex kPrintTex[2] = {
 	{ SCALE(1), SCALE(1) },
@@ -136,17 +136,17 @@
 
 	if (tvMode == TV_DONT_CARE) {
 		if (PAL_NTSC_FLAG == 'E')
-			_videoMode = TV_NTSC;
-		else
 			_videoMode = TV_PAL;
+		else
+			_videoMode = TV_NTSC;
 	} else
 		_videoMode = tvMode;
 
 	printf("Setting up %s mode\n", (_videoMode == TV_PAL) ? "PAL" : "NTSC");
-
+	
     // set screen size, 640x544 for pal, 640x448 for ntsc
 	_tvWidth = 640;
-	_tvHeight = ((_videoMode == TV_PAL) ? 544 : 448); // PAL => 512?
+	_tvHeight = ((_videoMode == TV_PAL) ? 544 : 448);
 	kFullScreen[0].z = kFullScreen[1].z = 0;
 	kFullScreen[0].x = ORIGIN_X;
 	kFullScreen[0].y = ORIGIN_Y;

Index: GsDefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/GsDefs.h,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- GsDefs.h	25 Oct 2005 06:56:28 -0000	1.4.2.2
+++ GsDefs.h	12 Nov 2005 07:19:46 -0000	1.4.2.3
@@ -26,7 +26,7 @@
 
 // Gs2dScreen defines:
 
-#define PAL_NTSC_FLAG		(*((uint8*)0x1FC80000))
+#define PAL_NTSC_FLAG		(*(volatile uint8*)0x1FC7FF52)
 
 #define GS_PMODE			*((volatile uint64*)0x12000000)
 #define GS_CSR				*((volatile uint64*)0x12001000)

Index: READ_PS2.TXT
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/READ_PS2.TXT,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- READ_PS2.TXT	9 Nov 2005 20:05:49 -0000	1.1.2.2
+++ READ_PS2.TXT	12 Nov 2005 07:19:46 -0000	1.1.2.3
@@ -1,4 +1,4 @@
-ScummVM-PS2 0.8.0 Release Candidate 1 Readme
+ScummVM-PS2 0.8.0 Release Candidate 2 Readme
 ============================================
 
 You need a Playstation2 with a modchip of your choice in order to run ScummVM.
@@ -30,22 +30,20 @@
 
 For Linux or Mac OS X binaries check http://www.nobis-crew.org/cd-tool/
 
-Unfortunately, writing DVD images with cd-tool is currently broken and will
- crash when it reaches the 2GB limit. This problem will probably be fixed in
- the nearer future.
+Unfortunately, writing DVD images with cd-tool is currently broken.
+ This problem will probably be fixed in the nearer future.
 
 
 Notes
 =====
-- CD swapping doesn't work, unfortunately. So you should have all games
-   on the CD you booted from.
 - Curse of Monkey Island is unsupported. iMuse digital crashes often, 
    especially during Sea battles.
-- Zlib is unsupported, so compressed SAN files won't work.
+- Compressed SAN files need a lot of CPU power, probably because of zlib,
+   and are constantly out of sync. Uncompressed SANs play fine though, so
+   compress_san is NOT recommended.
 - The cd/dvd drive is a bottleneck, that's why you should compress the games
    with MP3 or Ogg/Vorbis using compress_scumm_sou / compress_scumm_bun /
-   compress_sword1 / compress_sword2 etc, but *not* compress_san as it
-   requires zlib. Besides, uncompressed SAN files play fine.
+   compress_sword1 / compress_sword2 etc, but NOT compress_san.
 - I haven't had time to implement a virtual keyboard. If you don't have a USB
    keyboard, you can only enter '1's using the Select button.
    (for copy protection screens as well as savegame names)
@@ -67,3 +65,13 @@
 Circle               -   Right mouse button
 Left analog stick    -   Mouse. Disabled when USB mouse is detected.
 
+
+
+Changes since 0.8.0 RC1
+=======================
+- Zlib was added
+- ScummVM looks for a ScummVM.ini in the CD/DVD's root directory before falling
+   back to the one on the Memory Card
+- Disc swapping was fixed
+- PAL/NTSC detection was fixed
+- Autosaves are now written every 15 minutes instead of every 5 minutes

Index: systemps2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/systemps2.cpp,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -d -r1.8.2.3 -r1.8.2.4
--- systemps2.cpp	9 Nov 2005 19:45:01 -0000	1.8.2.3
+++ systemps2.cpp	12 Nov 2005 07:19:46 -0000	1.8.2.4
@@ -114,7 +114,7 @@
 	sio_puts("IOP synced.");
 	SifInitRpc(0);
 	SifLoadFileInit();
-	cdvdInit(CDVD_INIT_NOWAIT);
+	cdvdInit(CDVD_INIT_WAIT);
 #endif
 
 	ee_thread_t thisThread;
@@ -778,6 +778,15 @@
 	LoadExecPS2("cdrom0:\\SCUMMVM.ELF", 0, NULL); // resets the console and executes the ELF
 }
 
+void OSystem_PS2::makeConfigPath(char *dest) {
+	FILE *handle = ps2_fopen("cdfs:/ScummVM.ini", "r");
+	if (handle) {
+		ps2_fclose(handle);
+		strcpy(dest, "cdfs:/scummvm.ini");
+	} else
+		strcpy(dest, "mc0:ScummVM/scummvm.ini");
+}
+
 static uint32 g_timeSecs;
 static int	  g_day, g_month, g_year;
 static uint32 g_lastTimeCheck;
@@ -851,11 +860,11 @@
 		g_day, g_month, g_year + 2000);
 }
 
-extern time_t time(time_t *p) {
+extern "C" time_t time(time_t *p) {
 	return (time_t)g_timeSecs;
 }
 
-extern struct tm *localtime(const time_t *p) {
+extern "C" struct tm *localtime(const time_t *p) {
 	uint32 currentSecs = g_timeSecs + (msecCount - g_lastTimeCheck) / 1000;
 	if (currentSecs >= SECONDS_PER_DAY) {
 		buildNewDate(+1);

Index: systemps2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/systemps2.h,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- systemps2.h	9 Nov 2005 19:45:01 -0000	1.7.2.3
+++ systemps2.h	12 Nov 2005 07:19:46 -0000	1.7.2.4
@@ -102,6 +102,7 @@
 	void timerThread(void);
 	void soundThread(void);
 	void msgPrintf(int millis, char *format, ...);
+	void makeConfigPath(char *dest);
 
 private:
 	volatile OSystem::TimerProc _scummTimerProc;





More information about the Scummvm-git-logs mailing list