some cleanup

svn-id: r21946

4 files changed, 9 insertions, 29 deletions

diff --git a/backends/psp/osys_psp.cpp b/backends/psp/osys_psp.cpp
index 4455d1dea9..a873d32473 100644
--- a/backends/psp/osys_psp.cpp
+++ b/backends/psp/osys_psp.cpp
@@ -636,13 +636,6 @@ void OSystem_PSP::setWindowCaption(const char *caption) {
 void OSystem_PSP::displayMessageOnOSD(const char *msg) {
 }
 
-
-/* moved to psp-gu.cpp */
-/*
-OSystem *OSystem_PSP_create() {
-	return new OSystem_PSP();
-}
-*/
 // Correct pixel format ABBBBBGGGGGRRRRR
 int gBitFormat = 1555;
 
diff --git a/backends/psp/osys_psp_gu.cpp b/backends/psp/osys_psp_gu.cpp
index d2b7e0d18f..53add476c5 100644
--- a/backends/psp/osys_psp_gu.cpp
+++ b/backends/psp/osys_psp_gu.cpp
@@ -618,7 +618,3 @@ bool OSystem_PSP_GU::pollEvent(Event &event) {
 	return false;
 }
 
-OSystem *OSystem_PSP_create() {
-	return new OSystem_PSP_GU();
-}
-
diff --git a/backends/psp/osys_psp_gu.h b/backends/psp/osys_psp_gu.h
index 78af729636..de3e4a3e65 100644
--- a/backends/psp/osys_psp_gu.h
+++ b/backends/psp/osys_psp_gu.h
@@ -28,8 +28,6 @@
 #include "common/rect.h"
 #include "osys_psp.h"
 
-#define min(a,b) (a > b ? b : a)
-
 class OSystem_PSP_GU : public OSystem_PSP
 {
 public:
diff --git a/backends/psp/psp_main.cpp b/backends/psp/psp_main.cpp
index 15580bebd6..64b48dc30e 100644
--- a/backends/psp/psp_main.cpp
+++ b/backends/psp/psp_main.cpp
@@ -22,11 +22,14 @@
  * $Id$
  *
  */
- 
+
+
+#define	USERSPACE_ONLY	//don't use kernel mode features
+
+#ifndef USERSPACE_ONLY
 #include <pspkernel.h>
 #include <pspdebug.h>
-#include <stdlib.h>
-#include <string.h>
+#endif
 
 #include <common/stdafx.h>
 #include <common/system.h>
@@ -38,8 +41,6 @@
 #include "./trace.h"
 
 
-#define	USERSPACE_ONLY
-
 
 /**
  * Define the module info section
@@ -108,13 +109,9 @@ int CallbackThread(SceSize /*size*/, void *arg) {
 }
 
 /* Sets up the callback thread and returns its thread id */
-int SetupCallbacks(void)
-{
-	int thid = 0;
-
-	thid = sceKernelCreateThread("update_thread", CallbackThread, 0x11, 0xFA0, THREAD_ATTR_USER, 0);
-	if(thid >= 0)
-	{
+int SetupCallbacks(void) {
+	int thid = sceKernelCreateThread("update_thread", CallbackThread, 0x11, 0xFA0, THREAD_ATTR_USER, 0);
+	if (thid >= 0) {
 		sceKernelStartThread(thid, 0, 0);
 	}
 
@@ -124,10 +121,6 @@ int SetupCallbacks(void)
 #undef main
 int main(void)
 {
-	//PSPDebugTrace("Init debug screen\n");
-	//pspDebugScreenInit();
-
-	//PSPDebugTrace("Setup callbacks\n");
 	SetupCallbacks();
 
 	//check if the save directory exists