diff options
| author | tsi <tsi> | 2007-09-16 01:54:22 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2007-09-16 01:54:22 +0000 |
| commit | 06e401555ec6fbe9bd39469587ef8f963c78868d (patch) | |
| tree | 986a67592b6bcd174accfab5607c657f2e0a8be6 | |
| parent | fe04ddcc98d17ff9c08f4cea9989afc223ef74ef (diff) | |
5. Fix bug in Xdmx's handling of USB devices (Marc La France).
| -rw-r--r-- | programs/Xserver/hw/dmx/input/usb-other.c | 4 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/programs/Xserver/hw/dmx/input/usb-other.c b/programs/Xserver/hw/dmx/input/usb-other.c index 968c894f0..7df4b36b6 100644 --- a/programs/Xserver/hw/dmx/input/usb-other.c +++ b/programs/Xserver/hw/dmx/input/usb-other.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/dmx/input/usb-other.c,v 1.1tsi Exp $ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * @@ -138,7 +138,7 @@ void othUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info) } else info->numAbsAxes = priv->numAbs; for (j = 0; j < info->numAbsAxes; j++) { - ioctl(priv->fd, EVIOCGABS(j), abs); + ioctl(priv->fd, EVIOCGABS(j), absolute); info->minval[1+j] = absolute[1]; info->maxval[1+j] = absolute[2]; info->res[1+j] = absolute[3]; diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index aaee4e15d..1938be6f4 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,5 @@ XFree86 4.7.99.2 (?? September 2007) + 5. Fix bug in Xdmx's handling of USB devices (Marc La France). 4. Darwin build fix, for the case where an X11 implementation has yet to be installed (Marc La France, problem reported by Yves de Champlain). 3. Change `lndir` utility to trim off trailing self-references (i.e. "/" and @@ -20604,4 +20605,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3908 2007/09/16 01:42:19 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3909 2007/09/16 01:49:13 tsi Exp $ |