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

sunmax at users.sourceforge.net sunmax at users.sourceforge.net
Wed Oct 14 02:36:55 CEST 2009 

Revision: 45052
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45052&view=rev
Author:   sunmax
Date:     2009-10-14 00:36:54 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
* Introduced dual license (GPL and Acedemic) for:

  ps2kbd.h
  ps2kbd.c
  us_keymap.h

* GPL licensed:

  irx_imports.h

* Added README.PS2

* Beautified "Makefile.PS2" and enabled -fno-rtti -fno-exceptions

* Enabled groovie, tucker & tinsel by default

* defined DISABLE_SAVEGAME_SORTING to get tinsel to compile
  ("mktime" / "difftime" missing on PS2...)

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/platform/ps2/Gs2dScreen.cpp
    scummvm/branches/branch-1-0-0/backends/platform/ps2/Makefile.ps2
    scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/CoDyVDfs/iop/irx_imports.h
    scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h
    scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/irx_imports.h
    scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c
    scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/us_keymap.h

Added Paths:
-----------
    scummvm/branches/branch-1-0-0/backends/platform/ps2/README.PS2

Modified: scummvm/branches/branch-1-0-0/backends/platform/ps2/Gs2dScreen.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/Gs2dScreen.cpp	2009-10-13 21:18:47 UTC (rev 45051)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/Gs2dScreen.cpp	2009-10-14 00:36:54 UTC (rev 45052)
@@ -1,4 +1,4 @@
-/* ScummVM - Graphic Adventure Engin
+/* ScummVM - Graphic Adventure Engine
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT

Modified: scummvm/branches/branch-1-0-0/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/Makefile.ps2	2009-10-13 21:18:47 UTC (rev 45051)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/Makefile.ps2	2009-10-14 00:36:54 UTC (rev 45052)
@@ -5,7 +5,7 @@
 PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
 PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
 
-ENABLED=STATIC_PLUGIN
+ENABLED = STATIC_PLUGIN
 
 #control build
 DISABLE_SCALERS = true
@@ -20,6 +20,7 @@
 ENABLE_CRUISE = $(ENABLED)
 ENABLE_DRASCULA = $(ENABLED)
 ENABLE_GOB = $(ENABLED)
+ENABLE_GROOVIE = $(ENABLED)
 ENABLE_IGOR = $(ENABLED)
 ENABLE_KYRA = $(ENABLED)
 ENABLE_LURE = $(ENABLED)
@@ -30,15 +31,17 @@
 ENABLE_SAGA = $(ENABLED)
 ENABLE_SAGA2 = $(ENABLED)
 ENABLE_IHNM = $(ENABLED)
+# ENABLE_SCI = $(ENABLED)
 ENABLE_SKY = $(ENABLED)
 ENABLE_SWORD1 = $(ENABLED)
 ENABLE_SWORD2 = $(ENABLED)
-# ENABLE_TINSEL = $(ENABLED)
+ENABLE_TINSEL = $(ENABLED)
 ENABLE_TOUCHE = $(ENABLED)
+ENABLE_TUCKER = $(ENABLED)
 
 HAVE_GCC3 = true
 
-CC		= ee-gcc
+CC      = ee-gcc
 CXX     = ee-g++
 AS      = ee-gcc
 LD      = ee-gcc
@@ -53,7 +56,7 @@
 INCDIR = ../../../
 # DEPDIR = .deps
 
-DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
+DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions
 
 
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
@@ -62,20 +65,20 @@
 TARGET = elf/scummvm.elf
 
 OBJS := backends/platform/ps2/DmaPipe.o \
-    backends/platform/ps2/Gs2dScreen.o \
-    backends/platform/ps2/irxboot.o \
+	backends/platform/ps2/Gs2dScreen.o \
+	backends/platform/ps2/irxboot.o \
 	backends/platform/ps2/ps2input.o \
 	backends/platform/ps2/ps2pad.o \
 	backends/platform/ps2/savefilemgr.o \
-    backends/platform/ps2/fileio.o \
-    backends/platform/ps2/asyncfio.o \
+	backends/platform/ps2/fileio.o \
+	backends/platform/ps2/asyncfio.o \
 	backends/platform/ps2/icon.o \
-    backends/platform/ps2/cd.o \
-    backends/platform/ps2/eecodyvdfs.o \
-    backends/platform/ps2/rpckbd.o \
-    backends/platform/ps2/systemps2.o \
-    backends/platform/ps2/ps2mutex.o \
-    backends/platform/ps2/ps2time.o \
+	backends/platform/ps2/cd.o \
+	backends/platform/ps2/eecodyvdfs.o \
+	backends/platform/ps2/rpckbd.o \
+	backends/platform/ps2/systemps2.o \
+	backends/platform/ps2/ps2mutex.o \
+	backends/platform/ps2/ps2time.o \
 	backends/platform/ps2/ps2debug.o
     
 MODULE_DIRS += .
@@ -92,4 +95,3 @@
 
 $(TARGET): $(OBJS)
 	$(LD) $^ $(LDFLAGS) -o $@
-

Added: scummvm/branches/branch-1-0-0/backends/platform/ps2/README.PS2
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/README.PS2	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/README.PS2	2009-10-14 00:36:54 UTC (rev 45052)
@@ -0,0 +1,106 @@
+Dear PS2 ScummVM enthusiast user,
+
+here you will find the latest and the greatest PS2 backend ever!
+
+
+                       *** Changelog (1.0.0) ***
+
+Enabled groovie, tucker & tinsel engines by default.
+
+
+                         *** Installation ***
+
+Some media drivers require all capitalized letter, so to be on the
+safe side store the files (SCUMMVM.ELF and *.IRX) in upper case.
+
+Here comes a full list of the required *.IRX (don't worry they are all
+provided pre-compiled in the binary release ;-)
+
+ IOMANX.IRX
+ FILEXIO.IRX
+ CODYVDFS.IRX
+ SJPCM.IRX
+ USBD.IRX
+ USB_MASS.IRX
+ PS2MOUSE.IRX
+ RPCKBD.IRX
+ POWEROFF.IRX
+ PS2DEV9.IRX
+ PS2ATAD.IRX
+ PS2HDD.IRX
+ PS2FS.IRX
+ PS2IP.IRX
+ PS2SMAP.IRX
+ PS2HOST.IRX
+
+Make sure they are all stored in the folder that contains your SCUMMVM.ELF!
+
+If you are starting ScummVM from CD/DVD then it will look for ScummVM.ini
+on the first MC and then on CD itself. In any other case it will look for
+a ScummVM.ini on the media folder from where you started SCUMMVM.ELF.
+
+Notes:
+
+ - depending on the media you install Scummvm/PS2 onto, it might be
+   picky about files cases, so I'd leave those *.IRX uppercase and
+   scummmodern.zip lower ;0)
+
+
+                             *** Remote ***
+
+You will need "PS2IP.IRX", "PS2SMAP.IRX" and "PS2HOST.IRX" drivers too
+in the folder where you are starting SCUMMVM.ELF if you want to use
+the remote capability.
+
+The IP 192.168.0.10 (ps2link default) is hardcoded in the source as
+"netArg" in irxboot.cpp, feel free to modify it to match your network
+configuration.
+
+If you are starting SCUMMVM.ELF over the net using ps2client then you
+are already set. If you are starting it in any other way, then you
+will have to "export" the folder where you are storing ScummVM games
+and data by starting ps2client from inside that folder. Eg. from a
+terminal:
+
+> ./ps2client -h [your ps2 ip] listen
+
+Do this -after- ScummVM is up and running otherwise it will fail to
+establish a connection.
+
+
+                           *** Gamepad ***
+
+The mapping is:
+
+Start Button         -   GMM
+R1                   -   'y'
+L1                   -   'n'
+R2                   -   '.'
+L2                   -   Numpad 0
+Triangle             -   Escape
+Square               -   Enter
+Cross                -   Left mouse button
+Circle               -   Right mouse button
+
+
+                            *** Bugs ***
+
+Though we made our best to make this release as bug free as possible
+there are still a few bugs left:
+
+ - file handling speed : (not really a bug, but a nuisance) : there
+   is probably space for some more optimization in the current file
+   management. The only case when it really bogs me it's when you
+   try to select a saved game and there is some lag.
+
+   Some game could start faster too when this is optimized.
+
+ - feel free to add your bug, suggestion, secret wish to this list!
+
+
+Now enough reading, rush to your PlayStation2 and start playing!
+
+Are you still reading?
+
+Have a lot of fun,
+  -Max Lingua


Property changes on: scummvm/branches/branch-1-0-0/backends/platform/ps2/README.PS2
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/CoDyVDfs/iop/irx_imports.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/CoDyVDfs/iop/irx_imports.h	2009-10-13 21:18:47 UTC (rev 45051)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/CoDyVDfs/iop/irx_imports.h	2009-10-14 00:36:54 UTC (rev 45052)
@@ -1,22 +1,33 @@
-/*
-# _____     ___ ____     ___ ____
-#  ____|   |    ____|   |        | |____|
-# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
-#-----------------------------------------------------------------------
-# Copyright (c) 2003 Marcus R. Brown <mrbrown at 0xd6.org>
-# Licenced under Academic Free License version 2.0
-# Review ps2sdk README & LICENSE files for further details.
-#
-# $Id$
-# Defines all IRX imports.
-*/
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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.
+ *
+ * https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/CoDyVDfs/iop/irx_imports.h $
+ * $Id$
+ *
+ */
+
 #ifndef IOP_IRX_IMPORTS_H
 #define IOP_IRX_IMPORTS_H
 
 #include "irx.h"
 
-/* Please keep these in alphabetical order!  */
 #include "cdvdman.h"
 #include "intrman.h"
 #include "iomanX.h"

Modified: scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h	2009-10-13 21:18:47 UTC (rev 45051)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h	2009-10-14 00:36:54 UTC (rev 45052)
@@ -4,9 +4,17 @@
 # |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
 #-----------------------------------------------------------------------
 # Copyright 2001-2004, ps2dev - http://www.ps2dev.org
-# Licenced under Academic Free License version 2.0
-# Review ps2sdk README & LICENSE files for further details.
-#
+# 
+# This file is dual licensed, with permission by the original author
+# TyRaNiD, under both the Academic Free License version 2.0 and the GNU
+# General Public License version 2 or later.
+# 
+# This means you can choose whether to use this code under the terms of
+# the Academic Free License version 2.0, or under the terms of the GNU
+# General Public License version 2 or later. As long as you comply to the
+# terms of at least one of these, you are allowed to use the code as
+# permitted by the respective license.
+# 
 # $Id$
 # USB Keyboard Driver for PS2
 */

Modified: scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/irx_imports.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/irx_imports.h	2009-10-13 21:18:47 UTC (rev 45051)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/irx_imports.h	2009-10-14 00:36:54 UTC (rev 45052)
@@ -1,22 +1,33 @@
-/*
-# _____     ___ ____     ___ ____
-#  ____|   |    ____|   |        | |____|
-# |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
-#-----------------------------------------------------------------------
-# Copyright (c) 2003 Marcus R. Brown <mrbrown at 0xd6.org>
-# Licenced under Academic Free License version 2.0
-# Review ps2sdk README & LICENSE files for further details.
-#
-# $Id$
-# Defines all IRX imports.
-*/
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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$
+ *
+ */
+
 #ifndef IOP_IRX_IMPORTS_H
 #define IOP_IRX_IMPORTS_H
 
 #include "irx.h"
 
-/* Please keep these in alphabetical order!  */
 #include "dmacman.h"
 #include "intrman.h"
 #include "libsd.h"
@@ -32,4 +43,4 @@
 #include "usbd.h"
 #include "vblank.h"
 
-#endif /* IOP_IRX_IMPORTS_H */
+#endif

Modified: scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c	2009-10-13 21:18:47 UTC (rev 45051)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c	2009-10-14 00:36:54 UTC (rev 45052)
@@ -4,9 +4,17 @@
 # |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
 #-----------------------------------------------------------------------
 # Copyright 2001-2005, ps2dev - http://www.ps2dev.org
-# Licenced under Academic Free License version 2.0
-# Review ps2sdk README & LICENSE files for further details.
 #
+# This file is dual licensed, with permission by the original author
+# TyRaNiD, under both the Academic Free License version 2.0 and the GNU
+# General Public License version 2 or later.
+# 
+# This means you can choose whether to use this code under the terms of
+# the Academic Free License version 2.0, or under the terms of the GNU
+# General Public License version 2 or later. As long as you comply to the
+# terms of at least one of these, you are allowed to use the code as
+# permitted by the respective license.
+# 
 # $Id$
 # USB Keyboard Driver for PS2
 */

Modified: scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/us_keymap.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/us_keymap.h	2009-10-13 21:18:47 UTC (rev 45051)
+++ scummvm/branches/branch-1-0-0/backends/platform/ps2/iop/rpckbd/src/us_keymap.h	2009-10-14 00:36:54 UTC (rev 45052)
@@ -4,9 +4,17 @@
 # |     ___|   |____ ___|    ____| |    \    PS2DEV Open Source Project.
 #-----------------------------------------------------------------------
 # Copyright 2001-2004, ps2dev - http://www.ps2dev.org
-# Licenced under Academic Free License version 2.0
-# Review ps2sdk README & LICENSE files for further details.
 #
+# This file is dual licensed, with permission by the original author
+# TyRaNiD, under both the Academic Free License version 2.0 and the GNU
+# General Public License version 2 or later.
+# 
+# This means you can choose whether to use this code under the terms of
+# the Academic Free License version 2.0, or under the terms of the GNU
+# General Public License version 2 or later. As long as you comply to the
+# terms of at least one of these, you are allowed to use the code as
+# permitted by the respective license.
+#
 # $Id$
 # USB Keyboard Driver for PS2
 */


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