X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=common%2Fwiz_video.c;h=854561808171311a066b758e655c515d9c9f26dd;hp=7996ee3f0bfa3d7b97808620cfd8e65c9dcfc366;hb=2798b18cd4b43be61c95ed1af12b02237424c06f;hpb=4d0451847a77d420284c7fb0f50b1f167c1118ee

diff --git a/common/wiz_video.c b/common/wiz_video.c
index 7996ee3..8545618 100644
--- a/common/wiz_video.c
+++ b/common/wiz_video.c
@@ -8,10 +8,11 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #include <linux/fb.h>
-#include "warm.h"
+#include "warm/warm.h"
 
 static volatile unsigned short *memregs;
-static volatile unsigned long  *memregl;
+static volatile unsigned int   *memregl;
+int probably_caanoo;
 int memdev = -1;
 
 #define FB_BUF_COUNT 4
@@ -67,6 +68,8 @@ static int vout_gp2x_init(int no_dblbuf)
 
 	printf("framebuffer: \"%s\" @ %08lx\n", fbfix.id, fbfix.smem_start);
 	fb_paddr[0] = fbfix.smem_start;
+	probably_caanoo = fb_paddr[0] >= 0x4000000;
+	printf("looking like Caanoo? %s.\n", probably_caanoo ? "yes" : "no");
 
 	gp2x_screens[0] = mmap(0, 320*240*2*FB_BUF_COUNT, PROT_READ|PROT_WRITE,
 			MAP_SHARED, memdev, fb_paddr[0]);
@@ -84,12 +87,12 @@ static int vout_gp2x_init(int no_dblbuf)
 			fprintf(stderr, "could not make fb buferable.\n");
 	}
 
-	printf("  %p -> %08x\n", gp2x_screens[0], fb_paddr[0]);
+	// printf("  %p -> %08x\n", gp2x_screens[0], fb_paddr[0]);
 	for (i = 1; i < FB_BUF_COUNT; i++)
 	{
 		fb_paddr[i] = fb_paddr[i-1] + 320*240*2;
 		gp2x_screens[i] = (char *)gp2x_screens[i-1] + 320*240*2;
-		printf("  %p -> %08x\n", gp2x_screens[i], fb_paddr[i]);
+		// printf("  %p -> %08x\n", gp2x_screens[i], fb_paddr[i]);
 	}
 	fb_work_buf = 0;
 	g_screen_ptr = gp2x_screens[0];
@@ -100,13 +103,86 @@ static int vout_gp2x_init(int no_dblbuf)
 	return 0;
 }
 
+static void vout_gp2x_set_mode(int bpp, int rot)
+{
+	int rot_cmd[2] = { 0, 0 };
+	int code = 0, bytes = 2;
+	unsigned int r;
+	int ret;
+
+	if (probably_caanoo)
+		rot = 0;
+
+	rot_cmd[0] = rot ? 6 : 5;
+	ret = ioctl(fbdev, _IOW('D', 90, int[2]), rot_cmd);
+	if (ret < 0)
+		perror("rot ioctl failed");
+
+	memregl[0x4004>>2] = rot ? 0x013f00ef : 0x00ef013f;
+	memregl[0x4000>>2] |= 1 << 3;
+
+	switch (bpp)
+	{
+		case 8:
+			code = 0x443a;
+			bytes = 1;
+			break;
+
+		case 15:
+		case 16:
+			code = 0x4432;
+			bytes = 2;
+			break;
+
+		default:
+			fprintf(stderr, "unhandled bpp request: %d\n", abs(bpp));
+			return;
+	}
+
+	memregl[0x405c>>2] = bytes;
+	memregl[0x4060>>2] = bytes * (rot ? 240 : 320);
+
+	r = memregl[0x4058>>2];
+	r = (r & 0xffff) | (code << 16) | 0x10;
+	memregl[0x4058>>2] = r;
+}
+
+static void vout_gp2x_set_palette16(unsigned short *pal, int len)
+{
+	int i;
+	for (i = 0; i < len; i++)
+		memregl[0x4070>>2] = (i << 24) | pal[i];
+}
+
+static void vout_gp2x_set_palette32(unsigned int *pal, int len)
+{
+	/* pollux palette is 16bpp only.. */
+	int i;
+	for (i = 0; i < len; i++)
+	{
+		int c = pal[i];
+		c = ((c >> 8) & 0xf800) | ((c >> 5) & 0x07c0) | ((c >> 3) & 0x001f);
+		memregl[0x4070>>2] = (i << 24) | c;
+	}
+}
+
 void vout_gp2x_finish(void)
 {
-	memregl[0x406C>>2] = fb_paddr[0];
-	memregl[0x4058>>2] |= 0x10;
-	close(fbdev);
+	if (memregl != NULL) {
+		if (memregl[0x4058>>2] & 0x10)
+			usleep(100000);
+		if (memregl[0x4058>>2] & 0x10)
+			printf("MLCCONTROL1 dirty? %08x %08x\n",
+				memregl[0x406C>>2], memregl[0x4058>>2]);
+
+		memregl[0x406C>>2] = fb_paddr[0];
+		memregl[0x4058>>2] |= 0x10;
+		munmap((void *)memregs, 0x20000);
+		memregs = NULL;
+		memregl = NULL;
+	}
 
-	munmap((void *)memregs, 0x20000);
+	close(fbdev);
 	close(memdev);
 
 	warm_finish();