X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fpsp.c;h=8d1134c506b19d5f0c96af8fa7dcc4072b758287;hb=6850f9ec3b7c97084f1f0567824c65aa56e7fabb;hp=cdf26ae2436a3c1858ede9289ce66e7dcf8af996;hpb=426ecc582f3f6f3d04f7b7ae25b548be7178c4fd;p=libpicofe.git

diff --git a/psp/psp.c b/psp/psp.c
index cdf26ae..8d1134c 100644
--- a/psp/psp.c
+++ b/psp/psp.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <pspkernel.h>
 #include <pspiofilemgr.h>
@@ -24,14 +25,14 @@ extern int pico_main(void);
 
 #ifndef FW15
 
-PSP_MODULE_INFO("PicoDrive", 0, 1, 35);
+PSP_MODULE_INFO("PicoDrive", 0, 1, 40);
 PSP_HEAP_SIZE_MAX();
 
 int main() { return pico_main(); }	/* just a wrapper */
 
 #else
 
-PSP_MODULE_INFO("PicoDrive", 0x1000, 1, 35);
+PSP_MODULE_INFO("PicoDrive", 0x1000, 1, 40);
 PSP_MAIN_THREAD_ATTR(0);
 
 int main()
@@ -44,7 +45,12 @@ int main()
 	thid = sceKernelCreateThread("pico_main", (SceKernelThreadEntry) pico_main, 32, 0x2000, PSP_THREAD_ATTR_USER, NULL);
 	if (thid >= 0)
 		sceKernelStartThread(thid, 0, 0);
+#ifndef GCOV
 	sceKernelExitDeleteThread(0);
+#else
+	while (engineState != PGS_Quit)
+		sceKernelDelayThread(1024 * 1024);
+#endif
 
 	return 0;
 }
@@ -54,6 +60,8 @@ int main()
 unsigned int __attribute__((aligned(16))) guCmdList[GU_CMDLIST_SIZE];
 
 void *psp_screen = VRAM_FB0;
+int psp_unhandled_suspend = 0;
+
 static int current_screen = 0; /* front bufer */
 
 static SceUID main_thread_id = -1;
@@ -83,7 +91,10 @@ static int power_callback(int unknown, int pwrflags, void *common)
 		}
 	}
 	else if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE)
+	{
 		engineState = old_state;
+		psp_unhandled_suspend = 1;
+	}
 
 	//sceDisplayWaitVblankStart();
 	return 0;
@@ -110,6 +121,11 @@ static int callback_thread(SceSize args, void *argp)
 void psp_init(void)
 {
 	SceUID thid;
+	char buff[128], *r;
+
+	/* fw 1.5 sometimes returns 8002032c, although getcwd works */
+	r = getcwd(buff, sizeof(buff));
+	if (r) sceIoChdir(buff);
 
 	main_thread_id = sceKernelGetThreadId();
 
@@ -253,6 +269,25 @@ void psp_wait_suspend(void)
 	sceDisplayWaitVblankStart();
 }
 
+void psp_resume_suspend(void)
+{
+	// for some reason file IO doesn't seem to work
+	// after resume for some period of time, at least on 1.5
+	SceUID fd;
+	int i;
+	for (i = 0; i < 30; i++) {
+		fd = sceIoOpen("dummy.txt", PSP_O_WRONLY|PSP_O_APPEND, 0777);
+		if (fd != 0x80010013) break; // device not available
+		sceKernelDelayThread(32 * 1024);
+	}
+	if (fd >= 0) sceIoClose(fd);
+	sceDisplayWaitVblankStart();
+	psp_unhandled_suspend = 0;
+	if (i < 30)
+	     lprintf("io resumed after %i tries\n", i);
+	else lprintf("io resume failed\n");
+}
+
 /* alt logging */
 #define LOG_FILE "log.txt"
 
@@ -276,6 +311,7 @@ void lprintf(const char *fmt, ...)
 	va_end(vl);
 #else
 	static SceUID logfd = -1;
+	static int msg_count = 0;
 	char buff[256];
 	log_entry *le, *le1;
 
@@ -302,7 +338,7 @@ void lprintf(const char *fmt, ...)
 
 	logfd = sceIoOpen(LOG_FILE, PSP_O_WRONLY|PSP_O_APPEND, 0777);
 	if (logfd < 0) {
-		logfd = -2;
+		if (msg_count == 0) logfd = -2;
 		return;
 	}
 
@@ -316,10 +352,12 @@ void lprintf(const char *fmt, ...)
 			le1 = le->next;
 			sceIoWrite(logfd, le->buff, strlen(le->buff));
 			free(le);
+			msg_count++;
 		}
 	}
 
 	sceIoWrite(logfd, buff, strlen(buff));
+	msg_count++;
 
 	// make sure it gets flushed
 	sceIoClose(logfd);