summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Beykun <rzk333@gmail.com>2012-11-08 00:23:55 +0400
committerDmitriy Beykun <rzk333@gmail.com>2012-11-08 00:23:55 +0400
commit3c165acad291d1a5a8887f281a662c6bda4ce42e (patch)
treeb26c9e5c1835f0c3c2437e0cca773870a45ae0e4
parent93ff10156b9941bd7464e8db85e2d379649b74ff (diff)
downloadxf86-video-mali-3c165acad291d1a5a8887f281a662c6bda4ce42e.tar.xz
mali_fbdev: fix device pointers, print out actual string from config
-rw-r--r--src/mali_fbdev.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mali_fbdev.c b/src/mali_fbdev.c
index 4a3ec1f..9bfa033 100644
--- a/src/mali_fbdev.c
+++ b/src/mali_fbdev.c
@@ -329,7 +329,7 @@ static void FBDev_crtc_config( ScrnInfoPtr pScrn )
TRACE_EXIT();
}
-static int mali_open( int scrnIndex, char *device, char **namep )
+static int mali_open( int scrnIndex, const char *device, char **namep )
{
int fd;
struct fb_fix_screeninfo fix;
@@ -663,7 +663,7 @@ void MaliHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
}
}
-xf86SwitchModeProc *MaliHWSwitchModeWeak( void ) { return MaliHWSwitchMode; }
+xf86SwitchModeProc *MaliHWSwitchModeWeak(void) { return MaliHWSwitchMode; }
xf86AdjustFrameProc *MaliHWAdjustFrameWeak(void) { return MaliHWAdjustFrame; }
xf86EnterVTProc *MaliHWEnterVTWeak(void) { return MaliHWEnterVT; }
xf86LeaveVTProc *MaliHWLeaveVTWeak(void) { return MaliHWLeaveVT; }
@@ -679,7 +679,6 @@ static Bool MaliProbe( DriverPtr drv, int flags )
Bool foundScreen = FALSE;
ScrnInfoPtr pScrn;
GDevPtr *devSections;
- char *dev = "/dev/fb0";
ERROR_STR("MaliProbe");
@@ -689,7 +688,7 @@ static Bool MaliProbe( DriverPtr drv, int flags )
for (i = 0; i < numDevSections; i++)
{
- dev = xf86FindOptionValue( devSections[i]->options, "fbdev" );
+ char *dev = xf86FindOptionValue( devSections[i]->options, "fbdev" );
if ( MaliHWProbe( dev, NULL ) )
{
pScrn = NULL;
@@ -712,7 +711,7 @@ static Bool MaliProbe( DriverPtr drv, int flags )
pScrn->LeaveVT = MaliHWLeaveVTWeak();
pScrn->ValidMode = MaliHWValidModeWeak();
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "using %s\n", dev ? dev : "default device");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "using %s\n", dev);
}
}
}
@@ -721,7 +720,7 @@ static Bool MaliProbe( DriverPtr drv, int flags )
return foundScreen;
}
-Bool MaliHWInit( ScrnInfoPtr pScrn, char *device )
+Bool MaliHWInit( ScrnInfoPtr pScrn, const char *device )
{
MaliHWPtr fPtr;