psp fixes, gamma

[libpicofe.git] / psp / psp.c

diff --git a/psp/psp.c b/psp/psp.c
index a21507f..c507e5d 100644 (file)
--- a/psp/psp.c
+++ b/psp/psp.c
@@ -1,4 +1,10 @@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 
@@ -8,17 +14,50 @@
 #include <psppower.h>
 #include <psprtc.h>
 #include <pspgu.h>
+#include <pspsdk.h>
 
 #include "psp.h"
+#include "emu.h"
 #include "../common/lprintf.h"
 
-PSP_MODULE_INFO("PicoDrive", 0, 1, 34);
+extern int pico_main(void);
+
+#ifndef FW15
+
+PSP_MODULE_INFO("PicoDrive", 0, 1, 35);
+PSP_HEAP_SIZE_MAX();
+
+int main() { return pico_main(); }     /* just a wrapper */
+
+#else
+
+PSP_MODULE_INFO("PicoDrive", 0x1000, 1, 35);
+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);
+       sceKernelExitDeleteThread(0);
+
+       return 0;
+}
+
+#endif
 
 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;
+
 #define ANALOG_DEADZONE 80
 
 /* Exit callback */
@@ -28,16 +67,31 @@ static int exit_callback(int arg1, int arg2, void *common)
        return 0;
 }
 
+/* Power Callback */
+static int power_callback(int unknown, int pwrflags, void *common)
+{
+       /* 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)
+       {
+               lprintf("power_callback: flags: 0x%08X: suspending\n", pwrflags);
+               engineState = PGS_Menu;
+       }
+       //sceDisplayWaitVblankStart();
+       return 0;
+}
+
 /* Callback thread */
 static int callback_thread(SceSize args, void *argp)
 {
        int cbid;
 
-       lprintf("callback_thread started with id %i, priority %i\n",
+       lprintf("callback_thread started with id %08x, priority %i\n",
                sceKernelGetThreadId(), sceKernelGetThreadCurrentPriority());
 
        cbid = sceKernelCreateCallback("Exit Callback", exit_callback, NULL);
        sceKernelRegisterExitCallback(cbid);
+       cbid = sceKernelCreateCallback("Power Callback", power_callback, NULL);
+       scePowerRegisterCallback(0, cbid);
 
        sceKernelSleepThreadCB();
 
@@ -48,11 +102,13 @@ void psp_init(void)
 {
        SceUID thid;
 
-       lprintf("running in %08x kernel\n", sceKernelDevkitVersion()),
-       lprintf("entered psp_init, threadId %i, priority %i\n", sceKernelGetThreadId(),
+       main_thread_id = sceKernelGetThreadId();
+
+       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);
@@ -100,6 +156,7 @@ void psp_init(void)
 
 void psp_finish(void)
 {
+       lprintf("psp_finish..\n");
        sceGuTerm();
 
        //sceKernelSleepThread();
@@ -182,35 +239,77 @@ char *psp_get_status_line(void)
 }
 
 /* alt logging */
-#define LOG_FILE "log.log"
+#define LOG_FILE "log.txt"
 
-static SceUID logfd = -1;
+#ifndef LPRINTF_STDIO
+typedef struct _log_entry
+{
+       char buff[256];
+       struct _log_entry *next;
+} log_entry;
+
+static log_entry *le_root = NULL;
+#endif
 
 void lprintf_f(const char *fmt, ...)
 {
        va_list vl;
+
+#ifdef LPRINTF_STDIO
+       va_start(vl, fmt);
+       vprintf(fmt, vl);
+       va_end(vl);
+#else
+       static SceUID logfd = -1;
        char buff[256];
+       log_entry *le, *le1;
 
        if (logfd == -2) return; // disabled
 
-       if (logfd < 0)
+       va_start(vl, fmt);
+       vsnprintf(buff, sizeof(buff), fmt, vl);
+       va_end(vl);
+
+       // note: this is still unsafe code
+       if (main_thread_id != sceKernelGetThreadId())
        {
-               logfd = sceIoOpen(LOG_FILE, PSP_O_WRONLY|PSP_O_APPEND, 0777);
-               if (logfd < 0) {
-                       logfd = -2;
-                       return;
+               le = malloc(sizeof(*le));
+               if (le == NULL) return;
+               le->next = NULL;
+               strcpy(le->buff, buff);
+               if (le_root == NULL) le_root = le;
+               else {
+                       for (le1 = le_root; le1->next != NULL; le1 = le1->next);
+                       le1->next = le;
                }
+               return;
        }
 
-       va_start(vl, fmt);
-       vsnprintf(buff, sizeof(buff), fmt, vl);
-       va_end(vl);
+       logfd = sceIoOpen(LOG_FILE, PSP_O_WRONLY|PSP_O_APPEND, 0777);
+       if (logfd < 0) {
+               logfd = -2;
+               return;
+       }
+
+       if (le_root != NULL)
+       {
+               le1 = le_root;
+               le_root = NULL;
+               sceKernelDelayThread(1000);
+               while (le1 != NULL) {
+                       le = le1;
+                       le1 = le->next;
+                       sceIoWrite(logfd, le->buff, strlen(le->buff));
+                       free(le);
+               }
+       }
 
        sceIoWrite(logfd, buff, strlen(buff));
 
        // make sure it gets flushed
        sceIoClose(logfd);
        logfd = -1;
+#endif
 }