[Scummvm-cvs-logs] SF.net SVN: scummvm: [21946] scummvm/trunk/backends/psp

[joostp at users.sourceforge.net]

Revision: 21946
Author:   joostp
Date:     2006-04-16 07:40:12 -0700 (Sun, 16 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21946&view=rev

Log Message:
-----------
some cleanup

Modified Paths:
--------------
    scummvm/trunk/backends/psp/osys_psp.cpp
    scummvm/trunk/backends/psp/osys_psp_gu.cpp
    scummvm/trunk/backends/psp/osys_psp_gu.h
    scummvm/trunk/backends/psp/psp_main.cpp
Modified: scummvm/trunk/backends/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/psp/osys_psp.cpp	2006-04-16 14:14:22 UTC (rev 21945)
+++ scummvm/trunk/backends/psp/osys_psp.cpp	2006-04-16 14:40:12 UTC (rev 21946)
@@ -636,13 +636,6 @@
 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;
 

Modified: scummvm/trunk/backends/psp/osys_psp_gu.cpp
===================================================================
--- scummvm/trunk/backends/psp/osys_psp_gu.cpp	2006-04-16 14:14:22 UTC (rev 21945)
+++ scummvm/trunk/backends/psp/osys_psp_gu.cpp	2006-04-16 14:40:12 UTC (rev 21946)
@@ -618,7 +618,3 @@
 	return false;
 }
 
-OSystem *OSystem_PSP_create() {
-	return new OSystem_PSP_GU();
-}
-

Modified: scummvm/trunk/backends/psp/osys_psp_gu.h
===================================================================
--- scummvm/trunk/backends/psp/osys_psp_gu.h	2006-04-16 14:14:22 UTC (rev 21945)
+++ scummvm/trunk/backends/psp/osys_psp_gu.h	2006-04-16 14:40:12 UTC (rev 21946)
@@ -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:

Modified: scummvm/trunk/backends/psp/psp_main.cpp
===================================================================
--- scummvm/trunk/backends/psp/psp_main.cpp	2006-04-16 14:14:22 UTC (rev 21945)
+++ scummvm/trunk/backends/psp/psp_main.cpp	2006-04-16 14:40:12 UTC (rev 21946)
@@ -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,9 +41,7 @@
 #include "./trace.h"
 
 
-#define	USERSPACE_ONLY
 
-
 /**
  * Define the module info section
  *
@@ -108,13 +109,9 @@
 }
 
 /* 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 @@
 #undef main
 int main(void)
 {
-	//PSPDebugTrace("Init debug screen\n");
-	//pspDebugScreenInit();
-
-	//PSPDebugTrace("Setup callbacks\n");
 	SetupCallbacks();
 
 	//check if the save directory exists


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.