psp port runs, bad colors

[libpicofe.git] / psp / psp.c

diff --git a/psp/psp.c b/psp/psp.c
index 4bc1020..48e5e63 100644 (file)
--- a/psp/psp.c
+++ b/psp/psp.c
@@ -1,4 +1,9 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+
 #include <pspkernel.h>
+#include <pspiofilemgr.h>
 #include <pspdisplay.h>
 #include <pspgu.h>
 
@@ -10,6 +15,7 @@ PSP_MODULE_INFO("PicoDrive", 0, 1, 34);
 void *psp_screen = PSP_VRAM_BASE0;
 static int current_screen = 0; /* front bufer */
 
+static SceUID logfd = -1;
 
 /* Exit callback */
 static int exit_callback(int arg1, int arg2, void *common)
@@ -67,11 +73,17 @@ void psp_finish(void)
        sceKernelExitGame();
 }
 
-void psp_video_flip(void)
+void psp_video_flip(int wait_vsync)
 {
+       if (wait_vsync) sceDisplayWaitVblankStart();
        sceDisplaySetFrameBuf(psp_screen, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
        current_screen ^= 1;
-       psp_screen = current_screen ? PSP_VRAM_BASE1 : PSP_VRAM_BASE0;
+       psp_screen = current_screen ? PSP_VRAM_BASE0 : PSP_VRAM_BASE1;
+}
+
+void *psp_video_get_active_fb(void)
+{
+       return current_screen ? PSP_VRAM_BASE1 : PSP_VRAM_BASE0;
 }
 
 void psp_video_switch_to_single(void)
@@ -86,11 +98,39 @@ void psp_msleep(int ms)
        sceKernelDelayThread(ms * 1000);
 }
 
-unsigned int psp_pad_read(void)
+unsigned int psp_pad_read(int blocking)
 {
        SceCtrlData pad;
-       sceCtrlReadBufferPositive(&pad, 1);
+       if (blocking)
+            sceCtrlReadBufferPositive(&pad, 1);
+       else sceCtrlPeekBufferPositive(&pad, 1);
 
        return pad.Buttons;
 }
 
+/* alt logging */
+#define LOG_FILE "log.log"
+
+void lprintf_f(const char *fmt, ...)
+{
+       va_list vl;
+       char buff[256];
+
+       if (logfd < 0)
+       {
+               logfd = sceIoOpen(LOG_FILE, PSP_O_WRONLY|PSP_O_APPEND, 0777);
+               if (logfd < 0)
+                       return;
+       }
+
+       va_start(vl, fmt);
+       vsnprintf(buff, sizeof(buff), fmt, vl);
+       va_end(vl);
+
+       sceIoWrite(logfd, buff, strlen(buff));
+//sceKernelDelayThread(200 * 1000);
+sceIoClose(logfd);
+logfd = -1;
+}
+
+