diff options
| author | Will Thompson <will@willthompson.co.uk> | 2012-05-04 15:36:15 +0100 |
|---|---|---|
| committer | Will Thompson <will@willthompson.co.uk> | 2012-05-04 15:37:04 +0100 |
| commit | f1b1a687b4ce1b817cae889931e8d85d8890a848 (patch) | |
| tree | f587e25f2734eff6d77df3a8b5f485c5a6abb654 | |
| parent | 3e81e6fdc0d2c15d6a45a0e7e4e6668056dd1d79 (diff) | |
Enable warnings; fix warnings; fly.
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/videocore.c | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0fe614c..d29dbef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,10 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = \ + -Wall \ + @XORG_CFLAGS@ + videocore_drv_la_LTLIBRARIES = videocore_drv.la videocore_drv_la_LDFLAGS = -module -avoid-version videocore_drv_ladir = @moduledir@/drivers diff --git a/src/videocore.c b/src/videocore.c index 7a8ae57..22a86df 100644 --- a/src/videocore.c +++ b/src/videocore.c @@ -222,12 +222,12 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num, pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL, NULL, NULL, NULL, NULL); if (pScrn) { - char *device; + const char *device; GDevPtr devSection = xf86GetDevFromEntity(pScrn->entityList[0], pScrn->entityInstanceList[0]); device = xf86FindOptionValue(devSection->options, "fbdev"); - if (fbdevHWProbe(NULL, device, NULL)) { + if (fbdevHWProbe(NULL, (char *) device, NULL)) { pScrn->driverVersion = FBDEV_VERSION; pScrn->driverName = FBDEV_DRIVER_NAME; pScrn->name = FBDEV_NAME; @@ -266,7 +266,7 @@ FBDevProbe(DriverPtr drv, int flags) #ifndef XSERVER_LIBPCIACCESS int bus,device,func; #endif - char *dev; + const char *dev; Bool foundScreen = FALSE; TRACE("probe start"); @@ -300,10 +300,10 @@ FBDevProbe(DriverPtr drv, int flags) isIsa = TRUE; else #endif - 0; - + { + } } - if (fbdevHWProbe(NULL,dev,NULL)) { + if (fbdevHWProbe(NULL, (char *) dev, NULL)) { pScrn = NULL; if (isPci) { #ifndef XSERVER_LIBPCIACCESS @@ -402,7 +402,8 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) } #endif /* open device */ - if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev"))) + if (!fbdevHWInit(pScrn,NULL, + (char *) xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev"))) return FALSE; default_depth = fbdevHWGetDepth(pScrn,&fbbpp); if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp, |