[Scummvm-cvs-logs] CVS: scummvm/backends/psp psp_main.cpp,1.2.2.1,1.2.2.2

Joost Peters joostp at users.sourceforge.net
Fri Oct 28 15:41:25 CEST 2005


Update of /cvsroot/scummvm/scummvm/backends/psp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22344

Modified Files:
      Tag: branch-0-8-0
	psp_main.cpp 
Log Message:
Since we're re-tagging anyway, add conditional building of a 2.00 firmware EBOOT loader compatible version.


Index: psp_main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/psp/psp_main.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- psp_main.cpp	18 Oct 2005 02:11:17 -0000	1.2.2.1
+++ psp_main.cpp	28 Oct 2005 22:39:48 -0000	1.2.2.2
@@ -38,24 +38,34 @@
 #include "./trace.h"
 
 
+//#define	USERSPACE_ONLY
+
+
 /**
  * Define the module info section
  *
  * 2nd arg must 0x1000 so __init is executed in
  * kernelmode for our loaderInit function
  */
+#ifndef USERSPACE_ONLY
 PSP_MODULE_INFO("SCUMMVM-PSP", 0x1000, 1, 1);
+#else
+PSP_MODULE_INFO("SCUMMVM-PSP", 0, 1, 1);
+#endif
 
 /**
  * THREAD_ATTR_USER causes the thread that the startup
  * code (crt0.c) starts this program in to be in usermode
  * even though the module was started in kernelmode
  */
+#ifndef USERSPACE_ONLY
 PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER | THREAD_ATTR_VFPU);
+#endif
 
 /* global quit flag, this is used to let the VM engine shutdown properly */
 bool g_quit = false;
 
+#ifndef USERSPACE_ONLY
 void MyExceptionHandler(PspDebugRegBlock *regs) {
 	/* Do normal initial dump, setup screen etc */
 
@@ -80,7 +90,7 @@
 	pspKernelSetKernelPC();
 	pspDebugInstallErrorHandler(MyExceptionHandler);
 }
-
+#endif
 
 /* Exit callback */
 SceKernelCallbackFunction exit_callback(int /*arg1*/, int /*arg2*/, void * /*common*/) {





More information about the Scummvm-git-logs mailing list