Changeset View
Changeset View
Standalone View
Standalone View
head/x11-drivers/xf86-video-scfb/files/patch-src_scfb__driver.c
| Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Lines | @@ -302,7 +303,7 @@ scfb_mmap(size_t len, off_t off, int fd) | ||||
| mapaddr = NULL; | mapaddr = NULL; | ||||
| } | } | ||||
| #if DEBUG | #if DEBUG | ||||
| - ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %x\n", mapaddr, mapsize, fd, off); | - ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %x\n", mapaddr, mapsize, fd, off); | ||||
| + ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %lx\n", mapaddr, mapsize, fd, off); | + ErrorF("mmap returns: addr %p len 0x%x, fd %d, off %lx\n", mapaddr, mapsize, fd, off); | ||||
| #endif | #endif | ||||
| return mapaddr; | return mapaddr; | ||||
| } | } | ||||
| @@ -366,8 +367,8 @@ ScfbPreInit(ScrnInfoPtr pScrn, int flags | |||||
| struct fbtype fb; | |||||
| int default_depth, wstype; | |||||
| const char *dev; | |||||
| - char *mod = NULL, *s; | |||||
| - const char *reqSym = NULL; | |||||
| + char *mod = NULL; | |||||
| + const char *reqSym = NULL, *s; | |||||
| Gamma zeros = {0.0, 0.0, 0.0}; | |||||
| DisplayModePtr mode; | |||||
| @@ -633,9 +634,9 @@ ScfbShadowInit(ScreenPtr pScreen) | @@ -633,9 +634,9 @@ ScfbShadowInit(ScreenPtr pScreen) | ||||
| } | } | ||||
| static Bool | static Bool | ||||
| -ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | -ScfbScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) | ||||
| +ScfbScreenInit(SCREEN_INIT_ARGS_DECL) | +ScfbScreenInit(SCREEN_INIT_ARGS_DECL) | ||||
| { | { | ||||
| - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; | - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; | ||||
| ▲ Show 20 Lines • Show All 154 Lines • Show Last 20 Lines | |||||