in video mode chage ui to 565 fail
authorroot <root@huangds-desktop.(none)>
Thu, 10 Mar 2011 09:08:32 +0000 (17:08 +0800)
committerroot <root@huangds-desktop.(none)>
Thu, 10 Mar 2011 09:08:32 +0000 (17:08 +0800)
drivers/video/fbmem.c [changed mode: 0644->0755]
drivers/video/rk29_fb.c
include/linux/fb.h

old mode 100644 (file)
new mode 100755 (executable)
index 8e60b26..27e40d3
@@ -41,8 +41,6 @@
      */
 
 #define FBPIXMAPSIZE   (1024 * 8)
-#define SETFBIOVADDR    0x4619
-#define GETFBIOVADDR    0x4620
 
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
 int num_registered_fb __read_mostly;
@@ -1147,17 +1145,6 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                release_console_sem();
                unlock_fb_info(info);
                break;
-#if 1          
-       case SETFBIOVADDR:
-               if (copy_from_user(&fb_vaddr, argp, 4))
-                       return -EFAULT;
-               //printk("fbmem.c  set fb_vaddr = 0x%08x \n",fb_vaddr);
-               break;          
-       case GETFBIOVADDR:
-               copy_to_user(argp, &fb_vaddr, 4);
-               //printk("fbmem.c  get fb_vaddr = 0x%08x \n",fb_vaddr);
-               break;  
-#endif         
        default:
                if (!lock_fb_info(info))
                        return -ENODEV;
index f4a6432ee698ca0be7c0f9c2429067914d65d977..e290040a6f0cd3b1978c951719067bfff4cb8896 100755 (executable)
@@ -1499,11 +1499,13 @@ static int fb0_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
                 panel_size[1] = inf->cur_screen->y_res;
             }
             if(copy_to_user((void*)arg, panel_size, 8))  return -EFAULT;
+            break;
                }
        case FBIOPUT_GET_CURSOR_EN:
                {
             u32 en = LcdReadBit(inf, SYS_CONFIG, m_HWC_ENABLE);
             if(copy_to_user((void*)arg, &en, 4))  return -EFAULT;
+            break;
                }
    default:
         break;
index 74595389f4efbdb8bc331903e1755eeb40b35687..8d21255801e5102a1e397a2424d5f146f46e11a0 100755 (executable)
@@ -26,7 +26,6 @@ struct dentry;
 #define FBIOPUT_SET_CURSOR_CMAP    0x460c
 #define FBIOPUT_GET_CURSOR_RESOLUTION    0x460d
 #define FBIOPUT_GET_CURSOR_EN    0x460e
-#define FBIOGET_OVERLAY_STATE 0X460f
 #ifdef __KERNEL__
 #define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor_user)
 #else
@@ -46,6 +45,7 @@ struct dentry;
 #define FBIOGET_HWCINFO         0x4616
 #define FBIOPUT_MODEINFO        0x4617
 #define FBIOGET_DISPINFO        0x4618
+#define FBIOGET_OVERLAY_STATE   0X4619
 
 
 #define FB_TYPE_PACKED_PIXELS          0       /* Packed Pixels        */