X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2Fpicorestore.c;h=d2fb0a3fe7c041a979136af00917f7255023d20c;hb=090c1b1a301731b89923297c495a8af1c49ac506;hp=6a327552a458ff6edbf0998c824440a36594674b;hpb=f6eaae4f09c6abab99692900a31c1df2a06b99af;p=libpicofe.git

diff --git a/pandora/picorestore.c b/pandora/picorestore.c
index 6a32755..d2fb0a3 100644
--- a/pandora/picorestore.c
+++ b/pandora/picorestore.c
@@ -5,26 +5,26 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/fb.h>
-#include <termios.h>
+#include <linux/omapfb.h>
 #include <linux/kd.h>
 
 int main()
 {
 	struct fb_var_screeninfo fbvar;
-	struct termios kbd_termios;
+	struct omapfb_plane_info pi;
+	struct omapfb_mem_info mi;
 	int ret, fbdev, kbdfd;
-	FILE *tios_f;
 
 	fbdev = open("/dev/fb0", O_RDWR);
 	if (fbdev == -1) {
-		perror("open");
-		return 1;
+		perror("open fb0");
+		goto end_fb0;
 	}
 
 	ret = ioctl(fbdev, FBIOGET_VSCREENINFO, &fbvar);
 	if (ret == -1) {
 		perror("FBIOGET_VSCREENINFO ioctl");
-		goto end_fb;
+		goto end_fb0;
 	}
 
 	if (fbvar.yoffset != 0) {
@@ -37,31 +37,45 @@ int main()
 			printf("ok\n");
 	}
 
-end_fb:
-	close(fbdev);
+end_fb0:
+	if (fbdev >= 0)
+		close(fbdev);
+
+	fbdev = open("/dev/fb1", O_RDWR);
+	if (fbdev == -1) {
+		perror("open fb1");
+		goto end_fb1;
+	}
+
+	ret  = ioctl(fbdev, OMAPFB_QUERY_PLANE, &pi);
+	ret |= ioctl(fbdev, OMAPFB_QUERY_MEM, &mi);
+	if (ret != 0)
+		perror("QUERY_*");
 
-	tios_f = fopen("/tmp/pico_tios", "rb");
-	if (tios_f != NULL) {
-		kbdfd = open("/dev/tty", O_RDWR);
-		if (kbdfd == -1) {
-			perror("open /dev/tty");
-			return 1;
-		}
+	pi.enabled = 0;
+	ret = ioctl(fbdev, OMAPFB_SETUP_PLANE, &pi);
+	if (ret != 0)
+		perror("SETUP_PLANE");
 
-		if (fread(&kbd_termios, sizeof(kbd_termios), 1, tios_f) == 1) {
-			if (ioctl(kbdfd, KDSETMODE, KD_TEXT) == -1)
-				perror("KDSETMODE KD_TEXT");
+	mi.size = 0;
+	ret = ioctl(fbdev, OMAPFB_SETUP_MEM, &mi);
+	if (ret != 0)
+		perror("SETUP_MEM");
 
-			printf("restoring termios.. ");
-			if (tcsetattr(kbdfd, TCSAFLUSH, &kbd_termios) == -1)
-				perror("tcsetattr");
-			else
-				printf("ok\n");
-		}
+end_fb1:
+	if (fbdev >= 0)
+		close(fbdev);
 
-		close(kbdfd);
-		fclose(tios_f);
+	kbdfd = open("/dev/tty", O_RDWR);
+	if (kbdfd == -1) {
+		perror("open /dev/tty");
+		return 1;
 	}
 
+	if (ioctl(kbdfd, KDSETMODE, KD_TEXT) == -1)
+		perror("KDSETMODE KD_TEXT");
+
+	close(kbdfd);
+
 	return 0;
 }