From: notaz Date: Wed, 9 Jul 2008 19:52:17 +0000 (+0000) Subject: PSP sleep mode fixed, hopefully for read; 1.50 release X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b811a8abecf3ca8ee0b8a02214982a87d013e2f;p=libpicofe.git PSP sleep mode fixed, hopefully for read; 1.50 release git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@538 be3aeb3a-fb24-0410-a615-afba39da0efa --- diff --git a/base_readme.txt b/base_readme.txt index a6586e6..f99a4c0 100644 --- a/base_readme.txt +++ b/base_readme.txt @@ -657,7 +657,7 @@ Changelog * Improved renderer performance for shadow/hilight mode. * Added a hack for YM2612 frequency overflow issue (bleep noises in Shaq Fu, Spider-Man - The Animated Series (intro music), etc.) - Credits to Nemesis @ spritesmind forum. Works only sound rate + Credits to Nemesis @ spritesmind forum. Works only if sound rate is set to 44kHz. + Implemented some sprite rendering improvements, as suggested by Exophase. Games with lots of sprites now perform better. @@ -675,6 +675,7 @@ Changelog * Fixed a bug in Sega CD savestate loader, where the game would sometimes crash after load. * Fixed a crash of games using eeprom (introduced in 1.40b). + * PSP: fixed suspend/resume (hopefully for real). 1.40c * Fixed a problem with sound in Marble Madness. diff --git a/psp/emu.h b/psp/emu.h index 61e4e7a..1ef9450 100644 --- a/psp/emu.h +++ b/psp/emu.h @@ -15,6 +15,7 @@ enum TPicoGameState { PGS_Menu, PGS_RestartRun, PGS_Suspending, + PGS_SuspendAck, }; extern char romFileName[]; diff --git a/psp/main.c b/psp/main.c index 4c7eef6..d970f8a 100644 --- a/psp/main.c +++ b/psp/main.c @@ -12,7 +12,6 @@ #include "../common/emu.h" #include "../common/config.h" #include "../common/lprintf.h" -#include "version.h" #ifdef GPROF #include @@ -32,7 +31,6 @@ void dummy(void) int pico_main(void) { - lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n"); psp_init(); emu_prepareDefaultConfig(); @@ -71,8 +69,11 @@ int pico_main(void) break; case PGS_Suspending: - while (engineState == PGS_Suspending) + while (engineState == PGS_Suspending || engineState == PGS_SuspendAck) { + if (engineState == PGS_Suspending) + engineState = PGS_SuspendAck; psp_wait_suspend(); + } break; case PGS_RestartRun: diff --git a/psp/psp.c b/psp/psp.c index fd55b6c..4046e29 100644 --- a/psp/psp.c +++ b/psp/psp.c @@ -20,19 +20,20 @@ #include "psp.h" #include "emu.h" #include "../common/lprintf.h" +#include "version.h" extern int pico_main(void); #ifndef FW15 -PSP_MODULE_INFO("PicoDrive", 0, 1, 40); +PSP_MODULE_INFO("PicoDrive", 0, 1, 50); PSP_HEAP_SIZE_MAX(); int main() { return pico_main(); } /* just a wrapper */ #else -PSP_MODULE_INFO("PicoDrive", 0x1000, 1, 40); +PSP_MODULE_INFO("PicoDrive", 0x1000, 1, 50); PSP_MAIN_THREAD_ATTR(0); int main() @@ -79,16 +80,20 @@ static int exit_callback(int arg1, int arg2, void *common) static int power_callback(int unknown, int pwrflags, void *common) { static int old_state = PGS_Menu; + int i; lprintf("power_callback: flags: 0x%08X\n", pwrflags); /* check for power switch and suspending as one is manual and the other automatic */ if (pwrflags & PSP_POWER_CB_POWER_SWITCH || pwrflags & PSP_POWER_CB_SUSPENDING || pwrflags & PSP_POWER_CB_STANDBY) { - if (engineState != PGS_Suspending) { + if (engineState != PGS_Suspending && engineState != PGS_SuspendAck) { old_state = engineState; engineState = PGS_Suspending; } + for (i = 0; i < 10 && engineState != PGS_SuspendAck; i++) + sceKernelDelayThread(100*1024); + } else if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE) { @@ -129,6 +134,7 @@ void psp_init(void) main_thread_id = sceKernelGetThreadId(); + lprintf("\n%s\n", "PicoDrive v" VERSION " " __DATE__ " " __TIME__); lprintf("running on %08x kernel\n", sceKernelDevkitVersion()), lprintf("entered psp_init, threadId %08x, priority %i\n", main_thread_id, sceKernelGetThreadCurrentPriority()); @@ -304,6 +310,8 @@ typedef struct _log_entry static log_entry *le_root = NULL; #endif +/* strange: if this function leaks memory (before psp_init() call?), + * resume after suspend breaks on 3.90 */ void lprintf(const char *fmt, ...) { va_list vl;