X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fpsp.c;h=9ddb9527364f1212f597793d38fd016d1b34d021;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=51b44711a1c765874da061ea5fc4d30f6dc87b66;hpb=c633456460a2995bfa4732fb2fb0bca3c785936e;p=libpicofe.git diff --git a/psp/psp.c b/psp/psp.c index 51b4471..9ddb952 100644 --- a/psp/psp.c +++ b/psp/psp.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -14,17 +15,55 @@ #include #include #include +#include #include "psp.h" #include "emu.h" #include "../common/lprintf.h" +#include "version.h" -PSP_MODULE_INFO("PicoDrive", 0, 1, 34); +extern int pico_main(void); + +#ifndef FW15 + +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, 51); +PSP_MAIN_THREAD_ATTR(0); + +int main() +{ + SceUID thid; + + /* this is the thing we need the kernel mode for */ + pspSdkInstallNoDeviceCheckPatch(); + + 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; @@ -41,13 +80,22 @@ static int exit_callback(int arg1, int arg2, void *common) /* Power Callback */ static int power_callback(int unknown, int pwrflags, void *common) { + 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) + if (pwrflags & PSP_POWER_CB_POWER_SWITCH || pwrflags & PSP_POWER_CB_SUSPENDING || pwrflags & PSP_POWER_CB_STANDBY) { - lprintf("power_callback: flags: 0x%08X: suspending\n", pwrflags); - engineState = PGS_Menu; + psp_unhandled_suspend = 1; + if (engineState != PGS_Suspending) + engineStateSuspend = engineState; + sceKernelDelayThread(100000); // ?? } - sceDisplayWaitVblankStart(); + else if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE) + { + engineState = PGS_SuspendWake; + } + + //sceDisplayWaitVblankStart(); return 0; } @@ -72,14 +120,20 @@ 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()); - thid = sceKernelCreateThread("update_thread", callback_thread, 0x11, 0xFA0, 0, 0); + thid = sceKernelCreateThread("update_thread", callback_thread, 0x11, 0xFA0, 0, NULL); if (thid >= 0) { sceKernelStartThread(thid, 0, 0); @@ -170,11 +224,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; } @@ -209,6 +263,33 @@ char *psp_get_status_line(void) return buff; } +void psp_wait_suspend(void) +{ + // probably should do something smarter here? + 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" @@ -222,7 +303,9 @@ typedef struct _log_entry static log_entry *le_root = NULL; #endif -void lprintf_f(const char *fmt, ...) +/* 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; @@ -232,6 +315,7 @@ void lprintf_f(const char *fmt, ...) va_end(vl); #else static SceUID logfd = -1; + static int msg_count = 0; char buff[256]; log_entry *le, *le1; @@ -258,7 +342,7 @@ void lprintf_f(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; } @@ -272,10 +356,12 @@ void lprintf_f(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);