aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/platform/psp/Makefile3
-rw-r--r--backends/platform/psp/audio.cpp3
-rw-r--r--backends/platform/psp/display_manager.cpp3
-rw-r--r--backends/platform/psp/module.mk3
-rw-r--r--backends/platform/psp/osys_psp.cpp11
-rw-r--r--backends/platform/psp/osys_psp.h2
-rw-r--r--backends/platform/psp/psp_main.cpp3
-rw-r--r--backends/platform/psp/timer.cpp80
-rw-r--r--backends/platform/psp/timer.h47
9 files changed, 146 insertions, 9 deletions
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 6967973da7..6acd8e970a 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -148,7 +148,8 @@ OBJS := powerman.o \
trace.o \
psploader.o \
pspkeyboard.o \
- audio.o
+ audio.o \
+ timer.o
# Include common Scummvm makefile
include $(srcdir)/Makefile.common
diff --git a/backends/platform/psp/audio.cpp b/backends/platform/psp/audio.cpp
index c19cbb52a2..58b2251811 100644
--- a/backends/platform/psp/audio.cpp
+++ b/backends/platform/psp/audio.cpp
@@ -29,6 +29,7 @@
#include "common/scummsys.h"
#include "backends/platform/psp/audio.h"
+#include "backends/platform/psp/thread.h"
//#define __PSP_DEBUG_FUNCS__ /* For debugging function calls */
//#define __PSP_DEBUG_PRINT__ /* For debug printouts */
@@ -93,7 +94,7 @@ bool PspAudio::open(uint32 freq, uint32 numOfChannels, uint32 numOfSamples, call
bool PspAudio::createThread() {
DEBUG_ENTER_FUNC();
- int threadId = sceKernelCreateThread("audioThread", thread, 30, 16*1024, THREAD_ATTR_USER, 0);
+ int threadId = sceKernelCreateThread("audioThread", thread, PRIORITY_AUDIO_THREAD, STACK_AUDIO_THREAD, THREAD_ATTR_USER, 0);
if (threadId < 0) { // error
PSP_ERROR("failed to create audio thread. Error code %d\n", threadId);
diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp
index 0982512a86..c2f21e084b 100644
--- a/backends/platform/psp/display_manager.cpp
+++ b/backends/platform/psp/display_manager.cpp
@@ -34,6 +34,7 @@
#include "backends/platform/psp/default_display_client.h"
#include "backends/platform/psp/cursor.h"
#include "backends/platform/psp/pspkeyboard.h"
+#include "backends/platform/psp/thread.h"
#define USE_DISPLAY_CALLBACK // to use callback for finishing the render
#include "backends/platform/psp/display_manager.h"
@@ -64,7 +65,7 @@ const OSystem::GraphicsMode DisplayManager::_supportedModes[] = {
void MasterGuRenderer::setupCallbackThread() {
DEBUG_ENTER_FUNC();
- int thid = sceKernelCreateThread("displayCbThread", guCallbackThread, 0x11, 4*1024, THREAD_ATTR_USER, 0);
+ int thid = sceKernelCreateThread("displayCbThread", guCallbackThread, PRIORITY_DISPLAY_THREAD, STACK_DISPLAY_THREAD, THREAD_ATTR_USER, 0);
PSP_DEBUG_PRINT("Display CB thread id is %x\n", thid);
diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk
index 0e5bd8737d..461df629bf 100644
--- a/backends/platform/psp/module.mk
+++ b/backends/platform/psp/module.mk
@@ -13,7 +13,8 @@ MODULE_OBJS := powerman.o \
trace.o \
psploader.o \
pspkeyboard.o \
- audio.o
+ audio.o \
+ timer.o
MODULE_DIRS += \
backends/platform/psp/
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 5f51135a9a..f33081abbc 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -60,9 +60,9 @@ static int timer_handler(int t) {
void OSystem_PSP::initSDL() {
#ifdef USE_PSP_AUDIO
- SDL_Init(SDL_INIT_TIMER);
+ SDL_Init(0);
#else
- SDL_Init(SDL_INIT_AUDIO | SDL_INIT_TIMER);
+ SDL_Init(SDL_INIT_AUDIO);
#endif
}
@@ -90,7 +90,7 @@ void OSystem_PSP::initBackend() {
_inputHandler.init();
initSDL();
-
+
_savefile = new PSPSaveFileManager;
_timer = new DefaultTimerManager();
@@ -308,7 +308,10 @@ void OSystem_PSP::delayMillis(uint msecs) {
}
void OSystem_PSP::setTimerCallback(TimerProc callback, int interval) {
- SDL_SetTimer(interval, (SDL_TimerCallback)callback);
+ //SDL_SetTimer(interval, (SDL_TimerCallback)callback);
+ _pspTimer.setCallback((PspTimer::CallbackFunc)callback);
+ _pspTimer.setIntervalMs(interval);
+ _pspTimer.start();
}
OSystem::MutexRef OSystem_PSP::createMutex(void) {
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 4d9cf31b18..413de0f528 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -39,6 +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 <SDL.h>
@@ -57,6 +58,7 @@ private:
PSPKeyboard _keyboard;
InputHandler _inputHandler;
PspAudio _audio;
+ PspTimer _pspTimer;
void initSDL();
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index e568184990..e6940eba13 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -39,6 +39,7 @@
#include <base/main.h>
#include <base/plugins.h>
#include "backends/platform/psp/powerman.h"
+#include "backends/platform/psp/thread.h"
#include "backends/plugins/psp/psp-provider.h"
#include "backends/platform/psp/psppixelformat.h"
@@ -140,7 +141,7 @@ int CallbackThread(SceSize /*size*/, void *arg) {
/* Sets up the callback thread and returns its thread id */
int SetupCallbacks(void) {
- int thid = sceKernelCreateThread("update_thread", CallbackThread, 0x11, 0xFA0, THREAD_ATTR_USER, 0);
+ int thid = sceKernelCreateThread("power_thread", CallbackThread, PRIORITY_POWER_THREAD, STACK_POWER_THREAD, THREAD_ATTR_USER, 0);
if (thid >= 0) {
sceKernelStartThread(thid, 0, 0);
}
diff --git a/backends/platform/psp/timer.cpp b/backends/platform/psp/timer.cpp
new file mode 100644
index 0000000000..a35bd9d827
--- /dev/null
+++ b/backends/platform/psp/timer.cpp
@@ -0,0 +1,80 @@
+/* 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();
+ }
+};
diff --git a/backends/platform/psp/timer.h b/backends/platform/psp/timer.h
new file mode 100644
index 0000000000..ec31addb72
--- /dev/null
+++ b/backends/platform/psp/timer.h
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 03:14:59 +0000