Changeset 26464

Timestamp:

02/25/14 11:25:09 (9 years ago)

Author:

obi

Message:

mipsel optimize framebuffer blinking fix

Location:

titan/titan

Files:

• fb.h (modified) (5 diffs)
• mipselport.h (modified) (5 diffs)
• titan.c (modified) (1 diff)

titan/titan/fb.h

@@ -45 +45 @@
                 node = node->next;
         }
-
+        
         return fix_screeninfo.smem_len - fbmemcount;
 }
@@ -196 +196 @@
         if(checkbox("ATEMIO5000") == 1)
         {
-                g_fbFd = open(g_fbDevice, O_RDWR);
-                if (g_fbFd < 0)
+                if (fd < 0)
                 {
-                        perror(g_fbDevice);
+                        perror(fbdev);
                         goto nolfb;
                 }
@@ -211 +210 @@
         }
         closeonexec(fd);
-
+        
         if(ioctl(fd, FBIOGET_VSCREENINFO, &var_screeninfo) == -1)
         {
@@ -251 +250 @@
 // blinking work start
 nolfb:
-        if (g_fbFd >= 0)
-        {
-                close(g_fbFd);
-                g_fbFd = -1;
-        }
+        if (fd >= 0)
+        {
+                close(fd);
+                fd = -1;
+        }
+
         printf("framebuffer not available.\n");
         return 0;
@@ -263 +263 @@
 void closefb()
 {
+
+        if(checkbox("ATEMIO5000") == 1)
+        {
+                if(lfb)
+                {
+                printf("33\n");
+                        msync(lfb, fix_screeninfo.smem_len, MS_SYNC);
+                        munmap(lfb, fix_screeninfo.smem_len);
+                }
+                if(fb->fd >= 0)
+                {
+                printf("44\n");
+                        disablemanualblit();
+                        close(fb->fd);
+                        fb->fd = -1;
+                }
+        }
+
         if(fb != NULL)
         {

titan/titan/mipselport.h

@@ -8 +8 @@
 #endif
 
-int g_fbFd = -1;
-unsigned char *g_lfb = NULL;
-char g_fbDevice[] = "/dev/fb0";
+#ifndef FBIO_WAITFORVSYNC
+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
+#endif
+
+unsigned char *lfb = NULL;
 int g_manual_blit = 0;
-struct fb_var_screeninfo g_screeninfo_var;
-struct fb_fix_screeninfo g_screeninfo_fix;
+struct fb_fix_screeninfo fix_screeninfo;
 
 int setmixer(struct dvbdev* node, int left, int right)
@@ -67 +68 @@
 {
         unsigned char tmp = 1;
-        if (ioctl(g_fbFd, FBIO_SET_MANUAL_BLIT, &tmp)<0)
+        if (ioctl(fb->fd, FBIO_SET_MANUAL_BLIT, &tmp)<0)
                 perror("FBIO_SET_MANUAL_BLIT");
         else
@@ -76 +77 @@
 {
         unsigned char tmp = 0;
-        if (ioctl(g_fbFd, FBIO_SET_MANUAL_BLIT, &tmp)<0)
+        if (ioctl(fb->fd, FBIO_SET_MANUAL_BLIT, &tmp)<0)
                 perror("FBIO_SET_MANUAL_BLIT");
         else
                 g_manual_blit = 0;
+}
+
+int waitvsync()
+{
+        int c = 0;
+        return ioctl(fb->fd, FBIO_WAITFORVSYNC, &c);
 }
 
@@ -99 +106 @@
 void blitfb2(struct fb* fbnode, int flag)
 {
-/*
         struct fb_var_screeninfo var_screeninfo;
 
@@ -145 +151 @@
                 }
         }
-*/
+
         if (g_manual_blit == 1) {
-                if (ioctl(g_fbFd, FBIO_BLIT) < 0)
+                if (ioctl(fb->fd, FBIO_BLIT) < 0)
                         perr("FBIO_BLIT");
         }

titan/titan/titan.c

@@ -722 +722 @@
         clearfball();
         enablemanualblit();
+        if(checkbox("ATEMIO5000") == 1)
+                waitvsync();
 
         tmpstr = getconfig("fb1dev", NULL);