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=657e4af6d8a0c25d613c131fd2d669ee4489d6f8;hb=2798b18cd4b43be61c95ed1af12b02237424c06f;hpb=7000b522095b21ba16784d02997835d74ecc3375

diff --git a/common/wiz_video.c b/common/wiz_video.c
index 657e4af..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 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]);
@@ -107,6 +110,9 @@ static void vout_gp2x_set_mode(int bpp, int rot)
 	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)