diff -Nur DirectFB-DIRECTFB_1_7_7/gfxdrivers/davinci/davincifb.h DirectFB-DIRECTFB_1_7_7.old/gfxdrivers/davinci/davincifb.h --- DirectFB-DIRECTFB_1_7_7/gfxdrivers/davinci/davincifb.h 2015-02-10 00:29:36.000000000 +0800 +++ DirectFB-DIRECTFB_1_7_7.old/gfxdrivers/davinci/davincifb.h 2016-10-19 11:16:51.260500733 +0800 @@ -25,43 +25,43 @@ #include /* define the custom FBIO_WAITFORVSYNC ioctl */ -#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) +#define FBIO_WAITFORVSYNC _IOW('F', 0x20, uint32_t) #define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect) /* Backported IOCTLS. */ -#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t) -#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t) +#define FBIO_SETPOSX _IOW('F', 0x22, uint32_t) +#define FBIO_SETPOSY _IOW('F', 0x23, uint32_t) #define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params) -#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t) +#define FBIO_GETSTD _IOR('F', 0x25, uint32_t) #define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params) -#define FBIO_SYNC _IOW('F', 0x27, u_int32_t) +#define FBIO_SYNC _IOW('F', 0x27, uint32_t) typedef struct zoom_params { - u_int32_t window_id; - u_int32_t zoom_h; - u_int32_t zoom_v; + uint32_t window_id; + uint32_t zoom_h; + uint32_t zoom_v; } zoom_params_t; typedef struct vpfe_resizer_params { - u_int32_t rsz_cnt; //busy-lock - u_int32_t out_size; //busy-lock - u_int32_t in_start; //busy-lock - u_int32_t in_size; //busy-lock - u_int32_t sdr_inadd; //shadowed - u_int32_t sdr_inoff; //shadowed - u_int32_t sdr_outadd; //shadowed - u_int32_t sdr_outoff; //shadowed - u_int32_t hfilt[16]; //busy-lock - u_int32_t vfilt[16]; //busy-lock - u_int32_t yenh; //busy-lock + uint32_t rsz_cnt; //busy-lock + uint32_t out_size; //busy-lock + uint32_t in_start; //busy-lock + uint32_t in_size; //busy-lock + uint32_t sdr_inadd; //shadowed + uint32_t sdr_inoff; //shadowed + uint32_t sdr_outadd; //shadowed + uint32_t sdr_outoff; //shadowed + uint32_t hfilt[16]; //busy-lock + uint32_t vfilt[16]; //busy-lock + uint32_t yenh; //busy-lock } vpfe_resizer_params_t; typedef struct fb_set_start { int offset; /* offset from smem_start */ unsigned long physical; /* absolute physical address when offset < 0 */ - u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all, + uint64_t sync; /* input: target sync counter for change or 0 for no sync at all, output: sync counter of actual change or 0 if still pending */ } fb_set_start_t; @@ -111,7 +111,7 @@ #define FBIO_ENABLE_DISPLAY \ _IOW('F', 0x48, unsigned char) #define FBIO_SETPOS \ - _IOW('F', 0x49, u_int32_t) + _IOW('F', 0x49, uint32_t) #define FBIO_SET_CURSOR \ _IOW('F', 0x50, struct fb_cursor) #define FBIO_SET_START \ diff -Nur DirectFB-DIRECTFB_1_7_7/gfxdrivers/davinci/patches/ti-davinci-2.6.10-mvl401-fbio_set_start.patch DirectFB-DIRECTFB_1_7_7.old/gfxdrivers/davinci/patches/ti-davinci-2.6.10-mvl401-fbio_set_start.patch --- DirectFB-DIRECTFB_1_7_7/gfxdrivers/davinci/patches/ti-davinci-2.6.10-mvl401-fbio_set_start.patch 2015-02-10 00:29:36.000000000 +0800 +++ DirectFB-DIRECTFB_1_7_7.old/gfxdrivers/davinci/patches/ti-davinci-2.6.10-mvl401-fbio_set_start.patch 2016-10-19 11:16:51.260500733 +0800 @@ -3,7 +3,7 @@ --- include/video/davincifb.h (revision 765) +++ include/video/davincifb.h (working copy) @@ -40,6 +40,21 @@ - u_int32_t zoom_v; + uint32_t zoom_v; } zoom_params_t; + @@ -11,7 +11,7 @@ + int offset; /* offset from smem_start */ + unsigned long physical; /* absolute physical address when offset < 0 */ + -+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all, ++ uint64_t sync; /* input: target sync counter for change or 0 for no sync at all, + output: sync counter of actual change or 0 if still pending */ +} fb_set_start_t; + @@ -25,7 +25,7 @@ #define FBIO_ENABLE_DISABLE_WIN \ _IOW('F', 0x30, unsigned char) @@ -83,6 +98,8 @@ - _IOW('F', 0x49, u_int32_t) + _IOW('F', 0x49, uint32_t) #define FBIO_SET_CURSOR \ _IOW('F', 0x50, struct fb_cursor) +#define FBIO_SET_START \ diff -Nur DirectFB-DIRECTFB_1_7_7/gfxdrivers/unichrome/ucio.c DirectFB-DIRECTFB_1_7_7.old/gfxdrivers/unichrome/ucio.c --- DirectFB-DIRECTFB_1_7_7/gfxdrivers/unichrome/ucio.c 2015-02-10 00:29:36.000000000 +0800 +++ DirectFB-DIRECTFB_1_7_7.old/gfxdrivers/unichrome/ucio.c 2016-10-19 10:09:56.796572625 +0800 @@ -59,7 +59,7 @@ #include "uc_probe.h" // Test -#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) +#define FBIO_WAITFORVSYNC _IOW('F', 0x20, uint32_t) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include diff -Nur DirectFB-DIRECTFB_1_7_7/systems/fbdev/fbdev.h DirectFB-DIRECTFB_1_7_7.old/systems/fbdev/fbdev.h --- DirectFB-DIRECTFB_1_7_7/systems/fbdev/fbdev.h 2015-02-10 00:29:36.000000000 +0800 +++ DirectFB-DIRECTFB_1_7_7.old/systems/fbdev/fbdev.h 2016-10-19 10:09:56.796572625 +0800 @@ -50,7 +50,7 @@ #include "vt.h" #ifndef FBIO_WAITFORVSYNC -#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) +#define FBIO_WAITFORVSYNC _IOW('F', 0x20, uint32_t) #endif