PSP: moved timer thread to backends/timer/psp

svn-id: r49173

5 files changed, 3 insertions, 132 deletions

diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 6acd8e970a..6967973da7 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -148,8 +148,7 @@ OBJS := powerman.o \
 	trace.o \
 	psploader.o \
 	pspkeyboard.o \
-	audio.o \
-	timer.o
+	audio.o
 
 # Include common Scummvm makefile
 include $(srcdir)/Makefile.common
diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk
index 461df629bf..0e5bd8737d 100644
--- a/backends/platform/psp/module.mk
+++ b/backends/platform/psp/module.mk
@@ -13,8 +13,7 @@ MODULE_OBJS := powerman.o \
 	trace.o \
 	psploader.o \
 	pspkeyboard.o \
-	audio.o \
-	timer.o
+	audio.o
 
 MODULE_DIRS += \
 	backends/platform/psp/
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 413de0f528..3f075d0139 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -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>
 
diff --git a/backends/platform/psp/timer.cpp b/backends/platform/psp/timer.cpp
deleted file mode 100644
index a35bd9d827..0000000000
--- a/backends/platform/psp/timer.cpp
+++ /dev/null
@@ -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();
-	}
-};
diff --git a/backends/platform/psp/timer.h b/backends/platform/psp/timer.h
deleted file mode 100644
index ec31addb72..0000000000
--- a/backends/platform/psp/timer.h
+++ /dev/null
@@ -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