minor refactoring (lprintf)

[libpicofe.git] / pandora / picorestore.c

diff --git a/pandora/picorestore.c b/pandora/picorestore.c
index a278abc..d2fb0a3 100644 (file)
--- a/pandora/picorestore.c
+++ b/pandora/picorestore.c
@@ -5,23 +5,26 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/fb.h>
+#include <linux/omapfb.h>
 #include <linux/kd.h>
 
 int main()
 {
        struct fb_var_screeninfo fbvar;
+       struct omapfb_plane_info pi;
+       struct omapfb_mem_info mi;
        int ret, fbdev, kbdfd;
 
        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) {
@@ -34,8 +37,34 @@ 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_*");
+
+       pi.enabled = 0;
+       ret = ioctl(fbdev, OMAPFB_SETUP_PLANE, &pi);
+       if (ret != 0)
+               perror("SETUP_PLANE");
+
+       mi.size = 0;
+       ret = ioctl(fbdev, OMAPFB_SETUP_MEM, &mi);
+       if (ret != 0)
+               perror("SETUP_MEM");
+
+end_fb1:
+       if (fbdev >= 0)
+               close(fbdev);
 
        kbdfd = open("/dev/tty", O_RDWR);
        if (kbdfd == -1) {