X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpsp%2Fpsp.c;h=05af63d6126039bf6d17e63b53d270f2cfb8d7fb;hb=4b167c12c7ebb23223c347793a2b4d5e9712e384;hp=e740f2158a48966ca9595feb98fedddc71982bb1;hpb=70357ce52578dee0dd3b3663902cf872c3d34258;p=picodrive.git

diff --git a/platform/psp/psp.c b/platform/psp/psp.c
index e740f21..05af63d 100644
--- a/platform/psp/psp.c
+++ b/platform/psp/psp.c
@@ -6,6 +6,7 @@
 #include <pspiofilemgr.h>
 #include <pspdisplay.h>
 #include <psppower.h>
+#include <psprtc.h>
 #include <pspgu.h>
 
 #include "psp.h"
@@ -13,10 +14,12 @@
 
 PSP_MODULE_INFO("PicoDrive", 0, 1, 34);
 
-void *psp_screen = PSP_VRAM_BASE0;
+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;
+#define ANALOG_DEADZONE 80
 
 /* Exit callback */
 static int exit_callback(int arg1, int arg2, void *common)
@@ -30,7 +33,8 @@ 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);
@@ -42,9 +46,11 @@ static int callback_thread(SceSize args, void *argp)
 
 void psp_init(void)
 {
-	int thid;
+	SceUID thid;
 
-	lprintf("entered psp_init, threadId %i\n", sceKernelGetThreadId());
+	lprintf("running in %08x kernel\n", sceKernelDevkitVersion()),
+	lprintf("entered psp_init, threadId %08x, priority %i\n", sceKernelGetThreadId(),
+		sceKernelGetThreadCurrentPriority());
 
 	thid = sceKernelCreateThread("update_thread", callback_thread, 0x11, 0xFA0, 0, 0);
 	if (thid >= 0)
@@ -54,16 +60,42 @@ void psp_init(void)
 
 	/* video */
 	sceDisplaySetMode(0, 480, 272);
-	sceDisplaySetFrameBuf(PSP_VRAM_BASE1, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
+	sceDisplaySetFrameBuf(VRAM_FB1, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
 	current_screen = 1;
-	psp_screen = PSP_VRAM_BASE0;
+	psp_screen = VRAM_FB0;
 
 	/* gu */
 	sceGuInit();
 
+	sceGuStart(GU_DIRECT, guCmdList);
+	sceGuDrawBuffer(GU_PSM_5650, (void *)VRAMOFFS_FB0, 512);
+	sceGuDispBuffer(480, 272, (void *)VRAMOFFS_FB1, 512); // don't care
+	sceGuClear(GU_COLOR_BUFFER_BIT | GU_DEPTH_BUFFER_BIT);
+	sceGuDepthBuffer((void *)VRAMOFFS_DEPTH, 512);
+	sceGuOffset(2048 - (480 / 2), 2048 - (272 / 2));
+	sceGuViewport(2048, 2048, 480, 272);
+	sceGuDepthRange(0xc350, 0x2710);
+	sceGuScissor(0, 0, 480, 272);
+	sceGuEnable(GU_SCISSOR_TEST);
+
+	sceGuDepthMask(0xffff);
+	sceGuDisable(GU_DEPTH_TEST);
+
+	sceGuFrontFace(GU_CW);
+	sceGuEnable(GU_TEXTURE_2D);
+	sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGB);
+	sceGuAmbientColor(0xffffffff);
+	sceGuColor(0xffffffff);
+	sceGuFinish();
+	sceGuSync(0, 0);
+
+	sceDisplayWaitVblankStart();
+	sceGuDisplay(GU_TRUE);
+
+
 	/* input */
 	sceCtrlSetSamplingCycle(0);
-	sceCtrlSetSamplingMode(0);
+	sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
 }
 
 void psp_finish(void)
@@ -80,17 +112,17 @@ void psp_video_flip(int wait_vsync)
 	sceDisplaySetFrameBuf(psp_screen, 512, PSP_DISPLAY_PIXEL_FORMAT_565,
 		wait_vsync ? PSP_DISPLAY_SETBUF_IMMEDIATE : PSP_DISPLAY_SETBUF_NEXTFRAME);
 	current_screen ^= 1;
-	psp_screen = current_screen ? PSP_VRAM_BASE0 : PSP_VRAM_BASE1;
+	psp_screen = current_screen ? VRAM_FB0 : VRAM_FB1;
 }
 
 void *psp_video_get_active_fb(void)
 {
-	return current_screen ? PSP_VRAM_BASE1 : PSP_VRAM_BASE0;
+	return current_screen ? VRAM_FB1 : VRAM_FB0;
 }
 
 void psp_video_switch_to_single(void)
 {
-	psp_screen = PSP_VRAM_BASE0;
+	psp_screen = VRAM_FB0;
 	sceDisplaySetFrameBuf(psp_screen, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
 	current_screen = 0;
 }
@@ -102,12 +134,21 @@ void psp_msleep(int ms)
 
 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)
@@ -123,19 +164,42 @@ int psp_set_cpu_clock(int clock)
 	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"
 
+static SceUID logfd = -1;
+
 void lprintf_f(const char *fmt, ...)
 {
 	va_list vl;
 	char buff[256];
 
+	if (logfd == -2) return; // disabled
+
 	if (logfd < 0)
 	{
 		logfd = sceIoOpen(LOG_FILE, PSP_O_WRONLY|PSP_O_APPEND, 0777);
-		if (logfd < 0)
+		if (logfd < 0) {
+			logfd = -2;
 			return;
+		}
 	}
 
 	va_start(vl, fmt);
@@ -143,9 +207,10 @@ void lprintf_f(const char *fmt, ...)
 	va_end(vl);
 
 	sceIoWrite(logfd, buff, strlen(buff));
-//sceKernelDelayThread(200 * 1000);
-sceIoClose(logfd);
-logfd = -1;
+
+	// make sure it gets flushed
+	sceIoClose(logfd);
+	logfd = -1;
 }