#include <stdio.h>
+#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <pspiofilemgr.h>
#include <pspdisplay.h>
#include <psppower.h>
+#include <psprtc.h>
#include <pspgu.h>
#include "psp.h"
+#include "emu.h"
#include "../common/lprintf.h"
PSP_MODULE_INFO("PicoDrive", 0, 1, 34);
+PSP_HEAP_SIZE_MAX();
unsigned int __attribute__((aligned(16))) guCmdList[GU_CMDLIST_SIZE];
void *psp_screen = VRAM_FB0;
static int current_screen = 0; /* front bufer */
-static SceUID logfd = -1;
+static SceUID main_thread_id = -1;
+
+#define ANALOG_DEADZONE 80
/* Exit callback */
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\n", sceKernelGetThreadId());
+ 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();
void psp_init(void)
{
- int thid;
+ SceUID thid;
- lprintf("entered psp_init, threadId %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);
if (thid >= 0)
/* input */
sceCtrlSetSamplingCycle(0);
- sceCtrlSetSamplingMode(0);
+ sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
}
void psp_finish(void)
unsigned int psp_pad_read(int blocking)
{
+ unsigned int buttons;
SceCtrlData pad;
if (blocking)
sceCtrlReadBufferPositive(&pad, 1);
else sceCtrlPeekBufferPositive(&pad, 1);
+ 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;
- return pad.Buttons;
+ return buttons;
}
int psp_get_cpu_clock(void)
return ret;
}
+char *psp_get_status_line(void)
+{
+ static char buff[64];
+ int ret, bat_percent, bat_time;
+ pspTime time;
+
+ ret = sceRtcGetCurrentClockLocalTime(&time);
+ bat_percent = scePowerGetBatteryLifePercent();
+ bat_time = scePowerGetBatteryLifeTime();
+ if (ret < 0 || bat_percent < 0 || bat_time < 0) return NULL;
+
+ snprintf(buff, sizeof(buff), "%02i:%02i bat: %3i%%", time.hour, time.minutes, bat_percent);
+ if (!scePowerIsPowerOnline())
+ snprintf(buff+strlen(buff), sizeof(buff)-strlen(buff), " (%i:%02i)", bat_time/60, bat_time%60);
+ return buff;
+}
+
/* alt logging */
-#define LOG_FILE "log.log"
+#define LOG_FILE "log.txt"
+
+typedef struct _log_entry
+{
+ char buff[256];
+ struct _log_entry *next;
+} log_entry;
+
+static log_entry *le_root = NULL;
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 < 0)
- {
- logfd = sceIoOpen(LOG_FILE, PSP_O_WRONLY|PSP_O_APPEND, 0777);
- if (logfd < 0)
- return;
- }
+ if (logfd == -2) return; // disabled
va_start(vl, fmt);
vsnprintf(buff, sizeof(buff), fmt, vl);
va_end(vl);
+ // note: this is still unsafe code
+ if (main_thread_id != sceKernelGetThreadId())
+ {
+ 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;
+ }
+
+ 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));
-//sceKernelDelayThread(200 * 1000);
-sceIoClose(logfd);
-logfd = -1;
+
+ // make sure it gets flushed
+ sceIoClose(logfd);
+ logfd = -1;
+#endif
}
notaz.gp2x.de / libpicofe.git / blobdiff