[Scummvm-cvs-logs] SF.net SVN: scummvm:[49173] scummvm/trunk/backends
bluddy at users.sourceforge.net
bluddy at users.sourceforge.net
Mon May 24 05:05:17 CEST 2010
Revision: 49173
http://scummvm.svn.sourceforge.net/scummvm/?rev=49173&view=rev
Author: bluddy
Date: 2010-05-24 03:05:17 +0000 (Mon, 24 May 2010)
Log Message:
-----------
PSP: moved timer thread to backends/timer/psp
Modified Paths:
--------------
scummvm/trunk/backends/module.mk
scummvm/trunk/backends/platform/psp/Makefile
scummvm/trunk/backends/platform/psp/module.mk
scummvm/trunk/backends/platform/psp/osys_psp.h
Added Paths:
-----------
scummvm/trunk/backends/timer/psp/
scummvm/trunk/backends/timer/psp/timer.cpp
scummvm/trunk/backends/timer/psp/timer.h
Removed Paths:
-------------
scummvm/trunk/backends/platform/psp/timer.cpp
scummvm/trunk/backends/platform/psp/timer.h
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk 2010-05-23 23:26:28 UTC (rev 49172)
+++ scummvm/trunk/backends/module.mk 2010-05-24 03:05:17 UTC (rev 49173)
@@ -40,6 +40,7 @@
saves/posix/posix-saves.o \
saves/psp/psp-saves.o \
timer/default/default-timer.o \
+ timer/psp/timer.o \
vkeybd/image-map.o \
vkeybd/polygon.o \
vkeybd/virtual-keyboard.o \
Modified: scummvm/trunk/backends/platform/psp/Makefile
===================================================================
--- scummvm/trunk/backends/platform/psp/Makefile 2010-05-23 23:26:28 UTC (rev 49172)
+++ scummvm/trunk/backends/platform/psp/Makefile 2010-05-24 03:05:17 UTC (rev 49173)
@@ -148,8 +148,7 @@
trace.o \
psploader.o \
pspkeyboard.o \
- audio.o \
- timer.o
+ audio.o
# Include common Scummvm makefile
include $(srcdir)/Makefile.common
Modified: scummvm/trunk/backends/platform/psp/module.mk
===================================================================
--- scummvm/trunk/backends/platform/psp/module.mk 2010-05-23 23:26:28 UTC (rev 49172)
+++ scummvm/trunk/backends/platform/psp/module.mk 2010-05-24 03:05:17 UTC (rev 49173)
@@ -13,8 +13,7 @@
trace.o \
psploader.o \
pspkeyboard.o \
- audio.o \
- timer.o
+ audio.o
MODULE_DIRS += \
backends/platform/psp/
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2010-05-23 23:26:28 UTC (rev 49172)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2010-05-24 03:05:17 UTC (rev 49173)
@@ -39,7 +39,7 @@
#include "backends/platform/psp/display_manager.h"
#include "backends/platform/psp/input.h"
#include "backends/platform/psp/audio.h"
-#include "backends/platform/psp/timer.h"
+#include "backends/timer/psp/timer.h"
#include <SDL.h>
Deleted: scummvm/trunk/backends/platform/psp/timer.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/timer.cpp 2010-05-23 23:26:28 UTC (rev 49172)
+++ scummvm/trunk/backends/platform/psp/timer.cpp 2010-05-24 03:05:17 UTC (rev 49173)
@@ -1,80 +0,0 @@
-/* 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: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
- * $Id: osys_psp.cpp 46126 2009-11-24 14:18:46Z fingolfin $
- *
- */
-
-#include <pspthreadman.h>
-
-#include "common/scummsys.h"
-#include "common/timer.h"
-#include "backends/platform/psp/thread.h"
-#include "backends/platform/psp/timer.h"
-
-//#define __PSP_DEBUG_FUNCS__ /* For debugging function calls */
-//#define __PSP_DEBUG_PRINT__ /* For debug printouts */
-
-#include "backends/platform/psp/trace.h"
-
-bool PspTimer::start() {
- DEBUG_ENTER_FUNC();
-
- if (!_interval || !_callback)
- return false;
-
- _threadId = sceKernelCreateThread("timerThread", thread, PRIORITY_TIMER_THREAD, STACK_TIMER_THREAD, THREAD_ATTR_USER, 0);
-
- if (_threadId < 0) { // error
- PSP_ERROR("failed to create timer thread. Error code %d\n", _threadId);
- return false;
- }
-
- PspTimer *_this = this; // trick to get into context when the thread starts
- _init = true;
-
- if (sceKernelStartThread(_threadId, sizeof(uint32 *), &_this) < 0) {
- PSP_ERROR("failed to start thread %d\n", _threadId);
- return false;
- }
-
- PSP_DEBUG_PRINT("created timer thread[%x]\n", _threadId);
-
- return true;
-}
-
-int PspTimer::thread(SceSize, void *__this) {
- DEBUG_ENTER_FUNC();
- PspTimer *_this = *(PspTimer **)__this; // get our this for the context
-
- _this->timerThread();
- return 0;
-};
-
-void PspTimer::timerThread() {
- DEBUG_ENTER_FUNC();
-
- while (_init) {
- sceKernelDelayThread(_interval);
- PSP_DEBUG_PRINT("calling callback!\n");
- _callback();
- }
-};
Deleted: scummvm/trunk/backends/platform/psp/timer.h
===================================================================
--- scummvm/trunk/backends/platform/psp/timer.h 2010-05-23 23:26:28 UTC (rev 49172)
+++ scummvm/trunk/backends/platform/psp/timer.h 2010-05-24 03:05:17 UTC (rev 49173)
@@ -1,47 +0,0 @@
-/* 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: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
- * $Id: osys_psp.cpp 46126 2009-11-24 14:18:46Z fingolfin $
- *
- */
-
-#ifndef PSP_TIMER_H
-#define PSP_TIMER_H
-
-class PspTimer {
-public:
- typedef void (* CallbackFunc)(void);
- PspTimer() : _callback(0), _interval(0), _threadId(-1), _init(false) {}
- void stop() { _init = false; }
- bool start();
- ~PspTimer() { stop(); }
- void setCallback(CallbackFunc cb) { _callback = cb; }
- void setIntervalMs(uint32 interval) { _interval = interval * 1000; }
- static int thread(SceSize, void *__this); // static thread to use as bridge
- void timerThread();
-private:
- CallbackFunc _callback; // pointer to timer callback
- uint32 _interval;
- int _threadId;
- bool _init;
-};
-
-#endif
Copied: scummvm/trunk/backends/timer/psp/timer.cpp (from rev 49170, scummvm/trunk/backends/platform/psp/timer.cpp)
===================================================================
--- scummvm/trunk/backends/timer/psp/timer.cpp (rev 0)
+++ scummvm/trunk/backends/timer/psp/timer.cpp 2010-05-24 03:05:17 UTC (rev 49173)
@@ -0,0 +1,83 @@
+/* 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: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
+ * $Id: osys_psp.cpp 46126 2009-11-24 14:18:46Z fingolfin $
+ *
+ */
+
+#if defined (__PSP__)
+#include <pspthreadman.h>
+
+#include "common/scummsys.h"
+#include "common/timer.h"
+#include "backends/platform/psp/thread.h"
+#include "backends/timer/psp/timer.h"
+
+//#define __PSP_DEBUG_FUNCS__ /* For debugging function calls */
+//#define __PSP_DEBUG_PRINT__ /* For debug printouts */
+
+#include "backends/platform/psp/trace.h"
+
+bool PspTimer::start() {
+ DEBUG_ENTER_FUNC();
+
+ if (!_interval || !_callback)
+ return false;
+
+ _threadId = sceKernelCreateThread("timerThread", thread, PRIORITY_TIMER_THREAD, STACK_TIMER_THREAD, THREAD_ATTR_USER, 0);
+
+ if (_threadId < 0) { // error
+ PSP_ERROR("failed to create timer thread. Error code %d\n", _threadId);
+ return false;
+ }
+
+ PspTimer *_this = this; // trick to get into context when the thread starts
+ _init = true;
+
+ if (sceKernelStartThread(_threadId, sizeof(uint32 *), &_this) < 0) {
+ PSP_ERROR("failed to start thread %d\n", _threadId);
+ return false;
+ }
+
+ PSP_DEBUG_PRINT("created timer thread[%x]\n", _threadId);
+
+ return true;
+}
+
+int PspTimer::thread(SceSize, void *__this) {
+ DEBUG_ENTER_FUNC();
+ PspTimer *_this = *(PspTimer **)__this; // get our this for the context
+
+ _this->timerThread();
+ return 0;
+};
+
+void PspTimer::timerThread() {
+ DEBUG_ENTER_FUNC();
+
+ while (_init) {
+ sceKernelDelayThread(_interval);
+ PSP_DEBUG_PRINT("calling callback!\n");
+ _callback();
+ }
+};
+
+#endif /* __PSP__ */
Copied: scummvm/trunk/backends/timer/psp/timer.h (from rev 49170, scummvm/trunk/backends/platform/psp/timer.h)
===================================================================
--- scummvm/trunk/backends/timer/psp/timer.h (rev 0)
+++ scummvm/trunk/backends/timer/psp/timer.h 2010-05-24 03:05:17 UTC (rev 49173)
@@ -0,0 +1,47 @@
+/* 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: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
+ * $Id: osys_psp.cpp 46126 2009-11-24 14:18:46Z fingolfin $
+ *
+ */
+
+#ifndef PSP_TIMER_H
+#define PSP_TIMER_H
+
+class PspTimer {
+public:
+ typedef void (* CallbackFunc)(void);
+ PspTimer() : _callback(0), _interval(0), _threadId(-1), _init(false) {}
+ void stop() { _init = false; }
+ bool start();
+ ~PspTimer() { stop(); }
+ void setCallback(CallbackFunc cb) { _callback = cb; }
+ void setIntervalMs(uint32 interval) { _interval = interval * 1000; }
+ static int thread(SceSize, void *__this); // static thread to use as bridge
+ void timerThread();
+private:
+ CallbackFunc _callback; // pointer to timer callback
+ uint32 _interval;
+ int _threadId;
+ bool _init;
+};
+
+#endif
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