rk fb:rename rk fb specified ioctl

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index b12bc66945af8da331192a642b68b77f10f5a546..35abf4153238985b91fa001d9fb96322aa4d48fc 100644 (file)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -284,7 +284,8 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,unsigned long arg)
        {
                case FBIOPUT_FBPHYADD:
                        return info->fix.smem_start;
-               case FBIOSET_YUV_ADDR:   //when in video mode, buff alloc by android
+                       break;
+               case RK_FBIOSET_YUV_ADDR:   //when in video mode, buff alloc by android
                        //if((!strcmp(fix->id,"fb1"))||(!strcmp(fix->id,"fb3")))
                        {
                                if (copy_from_user(yuv_phy, argp, 8))
@@ -293,44 +294,32 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,unsigned long arg)
                                info->fix.mmio_start = yuv_phy[1];  //four uv
                        }
                        break;
-               case FBIOSET_ENABLE:
+               case RK_FBIOSET_ENABLE:
                        if (copy_from_user(&enable, argp, sizeof(enable)))
                                return -EFAULT;
                        dev_drv->open(dev_drv,layer_id,enable);
                        break;
-               case FBIOGET_ENABLE:
+               case RK_FBIOGET_ENABLE:
                        enable = dev_drv->get_layer_state(dev_drv,layer_id);
                        if(copy_to_user(argp,&enable,sizeof(enable)))
                                return -EFAULT;
                        break;
-               case FBIOSET_OVERLAY_STATE:
+               case RK_FBIOSET_OVERLAY_STATE:
                        if (copy_from_user(&ovl, argp, sizeof(ovl)))
                                return -EFAULT;
                        dev_drv->ovl_mgr(dev_drv,ovl,1);
                        break;
-               case FBIOGET_OVERLAY_STATE:
+               case RK_FBIOGET_OVERLAY_STATE:
                        ovl = dev_drv->ovl_mgr(dev_drv,0,0);
                        if (copy_to_user(argp, &ovl, sizeof(ovl)))
                                return -EFAULT;
                        break;
-               case FBIOPUT_NUM_BUFFERS:
+               case RK_FBIOPUT_NUM_BUFFERS:
                        if (copy_from_user(&num_buf, argp, sizeof(num_buf)))
                                return -EFAULT;
                        dev_drv->num_buf = num_buf;
                        printk("rk fb use %d buffers\n",num_buf);
                        break;
-               case FBIOGET_SCREEN_STATE:
-               case FBIOPUT_SET_CURSOR_EN:
-               case FBIOPUT_SET_CURSOR_POS:
-               case FBIOPUT_SET_CURSOR_IMG:
-               case FBIOPUT_SET_CURSOR_CMAP:
-               case FBIOPUT_GET_CURSOR_RESOLUTION:
-               case FBIOPUT_GET_CURSOR_EN:
-               case FB0_IOCTL_STOP_TIMER_FLUSH:    //stop timer flush mcu panel after android is runing
-               case FBIOPUT_16OR32:
-               case FBIOGET_16OR32:
-               case FBIOGET_IDLEFBUff_16OR32:
-               case FBIOSET_COMPOSE_LAYER_COUNTS:
                default:
                        dev_drv->ioctl(dev_drv,cmd,arg,layer_id);
             break;

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 5a24a1470b0149b0fc1a50f55e7645f085120f81..677d0c420f547bcf5f2f3357d35d1f522d969552 100755 (executable)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -27,7 +27,6 @@
 #define FBIOPUT_SET_CURSOR_CMAP    0x460c
 #define FBIOPUT_GET_CURSOR_RESOLUTION    0x460d
 #define FBIOPUT_GET_CURSOR_EN    0x460e
-#define FBIOPUT_NUM_BUFFERS    0x4625
 
 #ifdef __KERNEL__
 #define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor_user)
@@ -49,12 +48,8 @@
 #define FBIOPUT_MODEINFO        0x4617
 #define FBIOGET_DISPINFO        0x4618
 #define FBIO_WAITFORVSYNC      _IOW('F', 0x20, __u32)
-#define FBIOGET_OVERLAY_STATE   0X4619
-#define FBIOGET_SCREEN_STATE    0X4620
-#define FBIOGET_16OR32    0X4621
-#define FBIOGET_IDLEFBUff_16OR32    0X4622
-#define FBIOSET_COMPOSE_LAYER_COUNTS    0X4623
-#define FBIOGET_COMPOSE_LAYER_COUNTS    0X4624
+
+
 
 #define FB_TYPE_PACKED_PIXELS          0       /* Packed Pixels        */
 #define FB_TYPE_PLANES                 1       /* Non interleaved planes */

diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index 8a220269a78cf86e0a559e0322711b5455f29799..1a7e1fc9c1236e3b8ba1171f91ad803b64a46176 100644 (file)
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -42,17 +42,23 @@
 #define FB0_IOCTL_CLOSE_BUF                            0x6019
 #endif
 
-#define FBIOGET_PANEL_SIZE             0x5001
-#define FBIOSET_YUV_ADDR               0x5002
-//#define FB1_TOCTL_SET_MCU_DIR                        0x5003
-#define FBIOSET_ROTATE                 0x5003
-#define FB_IOCTL_SET_I2P_ODD_ADDR       0x5005
-#define FB_IOCTL_SET_I2P_EVEN_ADDR      0x5006
-#define FBIOSET_OVERLAY_STATE          0x5018
-#define FBIOSET_ENABLE                 0x5019  
-#define FBIOGET_ENABLE                 0x5020
+#define RK_FBIOGET_PANEL_SIZE          0x5001
+#define RK_FBIOSET_YUV_ADDR            0x5002
+#define RK_FBIOGET_SCREEN_STATE        0X4620
+#define RK_FBIOGET_16OR32              0X4621
+#define RK_FBIOGET_IDLEFBUff_16OR32            0X4622
+#define RK_FBIOSET_COMPOSE_LAYER_COUNTS    0X4623
+
+#define RK_FBIOSET_ROTATE              0x5003
+#define RK_FB_IOCTL_SET_I2P_ODD_ADDR       0x5005
+#define RK_FB_IOCTL_SET_I2P_EVEN_ADDR      0x5006
+#define RK_FBIOSET_OVERLAY_STATE       0x5018
+#define RK_FBIOGET_OVERLAY_STATE       0X4619
+#define RK_FBIOSET_ENABLE              0x5019  
+#define RK_FBIOGET_ENABLE              0x5020
 #define RK_FBIOSET_CONFIG_DONE         0x4628
 #define RK_FBIOSET_VSYNC_ENABLE                0x4629
+#define RK_FBIOPUT_NUM_BUFFERS         0x4625
 
 
 /********************************************************************