[Scummvm-cvs-logs] SF.net SVN: scummvm:[33983] scummvm/branches/branch-0-12-0/backends/ platform/ps2

[sunmax at users.sourceforge.net]

Revision: 33983
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33983&view=rev
Author:   sunmax
Date:     2008-08-18 06:29:35 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
- new Makefile.ps2 from trunk to comply with new plugins compiling strategy
  (default 'static')

- use USB_MASS.IRX instead of USBHDFSD.IRX as a driver to handle USB data

- modidifed systemps2.cpp to allow launching scummvm.elf from host: again

- updated READ_PS2.TXT

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/backends/platform/ps2/Makefile.ps2
    scummvm/branches/branch-0-12-0/backends/platform/ps2/READ_PS2.TXT
    scummvm/branches/branch-0-12-0/backends/platform/ps2/irxboot.cpp
    scummvm/branches/branch-0-12-0/backends/platform/ps2/systemps2.cpp

Modified: scummvm/branches/branch-0-12-0/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/ps2/Makefile.ps2	2008-08-17 22:50:39 UTC (rev 33982)
+++ scummvm/branches/branch-0-12-0/backends/platform/ps2/Makefile.ps2	2008-08-18 06:29:35 UTC (rev 33983)
@@ -1,9 +1,35 @@
 # $Header: Exp $
-include $(PS2SDK)/Defs.make
+ include $(PS2SDK)/Defs.make
 
+ENABLED=STATIC_PLUGIN
+
+#control build
 DISABLE_SCALERS = true
 DISABLE_HQ_SCALERS = true
-# DISABLE_KYRA = true
+
+ENABLE_SCUMM = $(ENABLED)
+ENABLE_SCUMM_7_8 = $(ENABLED)
+#ENABLE_HE = $(ENABLED)
+ENABLE_AGI = $(ENABLED)
+ENABLE_AGOS = $(ENABLED)
+#ENABLE_CINE = $(ENABLED)
+#ENABLE_CRUISE = $(ENABLED)
+ENABLE_DRASCULA = $(ENABLED)
+ENABLE_GOB = $(ENABLED)
+#ENABLE_IGOR = $(ENABLED)
+ENABLE_KYRA = $(ENABLED)
+ENABLE_LURE = $(ENABLED)
+#ENABLE_M4 = $(ENABLED)
+#ENABLE_MADE = $(ENABLED)
+#ENABLE_PARALLACTION = $(ENABLED)
+#ENABLE_QUEEN = $(ENABLED)
+#ENABLE_SAGA = $(ENABLED)
+ENABLE_SKY = $(ENABLED)
+ENABLE_SWORD1 = $(ENABLED)
+ENABLE_SWORD2 = $(ENABLED)
+#ENABLE_TINSEL = $(ENABLED)
+#ENABLE_TOUCHE = $(ENABLED)
+
 HAVE_GCC3 = true
 
 CC		= ee-gcc
@@ -19,7 +45,7 @@
 srcdir = ../../..
 VPATH = $(srcdir)
 INCDIR = ../../../
-DEPDIR = .deps
+# DEPDIR = .deps
 
 DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_MPEG2 -DUSE_ZLIB -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
 

Modified: scummvm/branches/branch-0-12-0/backends/platform/ps2/READ_PS2.TXT
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/ps2/READ_PS2.TXT	2008-08-17 22:50:39 UTC (rev 33982)
+++ scummvm/branches/branch-0-12-0/backends/platform/ps2/READ_PS2.TXT	2008-08-18 06:29:35 UTC (rev 33983)
@@ -1,4 +1,4 @@
-ScummVM-PS2 0.8.2 Readme
+ScummVM-PS2 0.12.0 Readme
 ========================
 
 You need a PlayStation 2 with a modchip of your choice in order to run ScummVM.
@@ -77,6 +77,7 @@
 
 
 
-Changes since 0.8.0 RC3
+Changes since 0.11.0
 =======================
-- USB Mass support was added
+
+- Support more games from USB (comi, kyra, bs1/2, etc.)

Modified: scummvm/branches/branch-0-12-0/backends/platform/ps2/irxboot.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/ps2/irxboot.cpp	2008-08-17 22:50:39 UTC (rev 33982)
+++ scummvm/branches/branch-0-12-0/backends/platform/ps2/irxboot.cpp	2008-08-18 06:29:35 UTC (rev 33983)
@@ -51,7 +51,7 @@
 	{ "USBD.IRX",     USB | OPTIONAL | DEPENDANCY, USB_DRIVER, NULL, 0 },
 	{ "PS2MOUSE.IRX", USB | OPTIONAL, MOUSE_DRIVER, NULL, 0 },
 	{ "RPCKBD.IRX",   USB | OPTIONAL, KBD_DRIVER, NULL, 0 },
-	{ "USBHDFSD.IRX", USB | OPTIONAL, MASS_DRIVER, NULL, 0 },
+	{ "USB_MASS.IRX", USB | OPTIONAL, MASS_DRIVER, NULL, 0 },
 
 	{ "PS2DEV9.IRX",  HDD | OPTIONAL | DEPENDANCY, HDD_DRIVER, NULL, 0 },
 	{ "PS2ATAD.IRX",  HDD | OPTIONAL | DEPENDANCY, HDD_DRIVER, NULL, 0 },

Modified: scummvm/branches/branch-0-12-0/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/ps2/systemps2.cpp	2008-08-17 22:50:39 UTC (rev 33982)
+++ scummvm/branches/branch-0-12-0/backends/platform/ps2/systemps2.cpp	2008-08-18 06:29:35 UTC (rev 33983)
@@ -281,11 +281,11 @@
 
 		dbg_printf("romeo : hddCheckPresent done : %d\n", _useHdd);
 
-		hddPreparePoweroff();
+		// hddPreparePoweroff();
 		//poweroffInit();
 		dbg_printf("romeo : hddPreparePoweroff done\n");     
 
-		hddSetUserPoweroffCallback(gluePowerOffCallback, this);
+		// hddSetUserPoweroffCallback(gluePowerOffCallback, this);
 		//poweroffSetCallback(gluePowerOffCallback, this);
 		dbg_printf("romeo : hddSetUserPoweroffCallback done\n");
 	}


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