X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpsp%2Fpsp.c;h=8aad4c0776653b35038683fe583b52aa9253d8a8;hb=cff531af94bd9c9c89ae162e80f48ddc26a4e504;hp=cdf26ae2436a3c1858ede9289ce66e7dcf8af996;hpb=7d0143a2de0f5551c90b29c1b1ee94e9c52b0952;p=picodrive.git diff --git a/platform/psp/psp.c b/platform/psp/psp.c index cdf26ae..8aad4c0 100644 --- a/platform/psp/psp.c +++ b/platform/psp/psp.c @@ -1,12 +1,15 @@ -// (c) Copyright 2007 notaz, All rights reserved. -// Free for non-commercial use. - -// For commercial use, separate licencing terms must be obtained. - +/* + * PicoDrive + * (C) notaz, 2007,2008 + * + * This work is licensed under the terms of MAME license. + * See COPYING file in the top-level directory. + */ #include #include #include #include +#include #include #include @@ -19,19 +22,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, 35); +PSP_MODULE_INFO("PicoDrive", 0, 1, 51); 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, 51); PSP_MAIN_THREAD_ATTR(0); int main() @@ -44,16 +48,24 @@ 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; } #endif +int psp_unhandled_suspend = 0; + unsigned int __attribute__((aligned(16))) guCmdList[GU_CMDLIST_SIZE]; void *psp_screen = VRAM_FB0; + static int current_screen = 0; /* front bufer */ static SceUID main_thread_id = -1; @@ -70,20 +82,20 @@ static int exit_callback(int arg1, int arg2, void *common) /* Power Callback */ static int power_callback(int unknown, int pwrflags, void *common) { - static int old_state = PGS_Menu; - 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) { - old_state = engineState; - engineState = PGS_Suspending; - } + psp_unhandled_suspend = 1; + if (engineState != PGS_Suspending) + engineStateSuspend = engineState; + sceKernelDelayThread(100000); // ?? } else if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE) - engineState = old_state; + { + engineState = PGS_SuspendWake; + } //sceDisplayWaitVblankStart(); return 0; @@ -110,9 +122,15 @@ 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(); + 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()); @@ -208,11 +226,11 @@ unsigned int psp_pad_read(int blocking) buttons = pad.Buttons; // analog.. - buttons &= ~(BTN_NUB_UP|BTN_NUB_DOWN|BTN_NUB_LEFT|BTN_NUB_RIGHT); - if (pad.Lx < 128 - ANALOG_DEADZONE) buttons |= BTN_NUB_LEFT; - if (pad.Lx > 128 + ANALOG_DEADZONE) buttons |= BTN_NUB_RIGHT; - if (pad.Ly < 128 - ANALOG_DEADZONE) buttons |= BTN_NUB_UP; - if (pad.Ly > 128 + ANALOG_DEADZONE) buttons |= BTN_NUB_DOWN; + buttons &= ~(PBTN_NUB_UP|PBTN_NUB_DOWN|PBTN_NUB_LEFT|PBTN_NUB_RIGHT); + if (pad.Lx < 128 - ANALOG_DEADZONE) buttons |= PBTN_NUB_LEFT; + if (pad.Lx > 128 + ANALOG_DEADZONE) buttons |= PBTN_NUB_RIGHT; + if (pad.Ly < 128 - ANALOG_DEADZONE) buttons |= PBTN_NUB_UP; + if (pad.Ly > 128 + ANALOG_DEADZONE) buttons |= PBTN_NUB_DOWN; return buttons; } @@ -253,6 +271,27 @@ 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("EBOOT.PBP", PSP_O_RDONLY, 0777); + if (fd >= 0) break; + sceKernelDelayThread(100 * 1024); + } + if (fd >= 0) sceIoClose(fd); + sceDisplayWaitVblankStart(); + if (i < 30) + lprintf("io resumed after %i tries\n", i); + else { + lprintf("io resume failed with %08x\n", fd); + sceKernelDelayThread(500 * 1024); + } +} + /* alt logging */ #define LOG_FILE "log.txt" @@ -266,6 +305,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; @@ -276,6 +317,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 +344,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 +358,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);