aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-27 06:40:50 +0000
committermarha <marha@users.sourceforge.net>2010-05-27 06:40:50 +0000
commit619d6f3626f36af85cc40eeee95c7585d906fe5c (patch)
tree0428401464cc6127a651c94261678072cb3bafc3 /xorg-server/hw/xfree86
parentd89c0289565a662a378df6e3c05de42982ab1c9d (diff)
parent80cb6bca9f771ef15c00cc41af2b9f315d66258d (diff)
downloadvcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.gz
vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.bz2
vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r--xorg-server/hw/xfree86/common/xf86Xinput.c8
-rw-r--r--xorg-server/hw/xfree86/int10/helper_mem.c5
2 files changed, 5 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 21921b2c3..2d82ccdbc 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -854,7 +854,7 @@ unwind:
}
void
-DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags)
+DeleteInputDeviceRequest(DeviceIntPtr pDev)
{
LocalDevicePtr pInfo = (LocalDevicePtr) pDev->public.devicePrivate;
InputDriverPtr drv = NULL;
@@ -874,9 +874,9 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags)
if (!isMaster && pInfo != NULL)
{
if(drv->UnInit)
- drv->UnInit(drv, pInfo, flags);
+ drv->UnInit(drv, pInfo, 0);
else
- xf86DeleteInput(pInfo, flags);
+ xf86DeleteInput(pInfo, 0);
/* devices added through HAL aren't in the config layout */
it = xf86ConfigLayout.inputs;
@@ -1267,7 +1267,7 @@ xf86DisableDevice(DeviceIntPtr dev, Bool panic)
} else
{
SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);
- DeleteInputDeviceRequest(dev, 0);
+ DeleteInputDeviceRequest(dev);
}
}
diff --git a/xorg-server/hw/xfree86/int10/helper_mem.c b/xorg-server/hw/xfree86/int10/helper_mem.c
index b95b56a93..610cd42ac 100644
--- a/xorg-server/hw/xfree86/int10/helper_mem.c
+++ b/xorg-server/hw/xfree86/int10/helper_mem.c
@@ -296,15 +296,12 @@ xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base)
unsigned i;
int cs = ~0;
int segments[4];
- const char * format;
segments[0] = MEM_RW(pInt, (0x10 << 2) + 2);
segments[1] = MEM_RW(pInt, (0x42 << 2) + 2);
segments[2] = V_BIOS >> 4;
segments[3] = ~0;
- format = "No V_BIOS found\n";
-
for (i = 0; segments[i] != ~0; i++) {
unsigned char * vbiosMem;
@@ -318,7 +315,7 @@ xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base)
}
if (segments[i] == ~0) {
- xf86DrvMsg(pInt->scrnIndex, X_ERROR, format, (unsigned long)cs << 4);
+ xf86DrvMsg(pInt->scrnIndex, X_ERROR, "No V_BIOS found\n");
return FALSE;
}