X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmain.c;h=e947b43c13de66566b3e9f7af3efe8e29f805119;hb=960a8e2716349f9a7df6cca9b6e8e6b0724fe7ba;hp=ffbc761f0346fae0741c7c3a56a3ae4e60f8c100;hpb=fe9e3b2544bdc6ba0fef167a949db4f90511f5ea;p=libpicofe.git

diff --git a/psp/main.c b/psp/main.c
index ffbc761..e947b43 100644
--- a/psp/main.c
+++ b/psp/main.c
@@ -1,3 +1,8 @@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
 #include <string.h>
 #include "psp.h"
 #include "emu.h"
@@ -8,14 +13,11 @@
 #include "../common/lprintf.h"
 #include "version.h"
 
-#define GPROF 0
-#define GCOV 0
-
-#if GPROF
+#ifdef GPROF
 #include <pspprof.h>
 #endif
 
-#if GCOV
+#ifdef GCOV
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -27,10 +29,11 @@ void dummy(void)
 }
 #endif
 
-int main()
+int pico_main(void)
 {
 	lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
 	psp_init();
+	emu_prepareDefaultConfig();
 	emu_ReadConfig(0, 0);
 	emu_Init();
 	menu_init();
@@ -44,10 +47,10 @@ int main()
 		switch (engineState)
 		{
 			case PGS_Menu:
-#if !GPROF
+#ifndef GPROF
 				menu_loop();
 #else
-				strcpy(romFileName, currentConfig.lastRomFile);
+				strcpy(romFileName, lastRomFile);
 				engineState = PGS_ReloadRom;
 #endif
 				break;
@@ -63,12 +66,21 @@ int main()
 				}
 				break;
 
+			case PGS_Suspending:
+				while (engineState == PGS_Suspending)
+					psp_wait_suspend();
+				break;
+
 			case PGS_RestartRun:
 				engineState = PGS_Running;
 
 			case PGS_Running:
+				if (psp_unhandled_suspend) {
+					psp_resume_suspend();
+					emu_HandleResume();
+				}
 				emu_Loop();
-#if GPROF
+#ifdef GPROF
 				goto endloop;
 #endif
 				break;
@@ -86,10 +98,10 @@ int main()
 
 	mp3_deinit();
 	emu_Deinit();
-#if GPROF
+#ifdef GPROF
 	gprof_cleanup();
 #endif
-#if !GCOV
+#ifndef GCOV
 	psp_finish();
 #endif