xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Wed May 26 07:55:52 PDT 2010
Xi/stubs.c | 2 +-
config/config.c | 2 +-
config/dbus.c | 2 +-
dix/devices.c | 2 +-
hw/dmx/dmxinput.c | 2 +-
hw/kdrive/linux/evdev.c | 4 ++--
hw/xfree86/common/xf86Module.h | 2 +-
hw/xfree86/common/xf86Xinput.c | 8 ++++----
hw/xquartz/darwinXinput.c | 2 +-
include/input.h | 6 +-----
10 files changed, 14 insertions(+), 18 deletions(-)
New commits:
commit 4e9d3e413245e7c01c2ff3c0f130b8967754131b
Author: Keith Packard <keithp at keithp.com>
Date: Wed May 26 07:54:35 2010 -0700
Revert "Add a "flags" field to DeleteInputDeviceRequest."
Peter wants to get a larger patch sequence put together and I didn't
read past the commit message to see the 'don't take this patch
please'.
This reverts commit 531ff40301975519af7b20109c17d296312d3f2b.
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 8285549..04ba976 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -241,6 +241,6 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
*
*/
void
-DeleteInputDeviceRequest(DeviceIntPtr dev, int flags)
+DeleteInputDeviceRequest(DeviceIntPtr dev)
{
}
diff --git a/config/config.c b/config/config.c
index f49420d..65ef679 100644
--- a/config/config.c
+++ b/config/config.c
@@ -81,7 +81,7 @@ remove_device(const char *backend, DeviceIntPtr dev)
* already been removed. */
OsBlockSignals();
ProcessInputEvents();
- DeleteInputDeviceRequest(dev, 0);
+ DeleteInputDeviceRequest(dev);
OsReleaseSignals();
}
diff --git a/config/dbus.c b/config/dbus.c
index 511908a..72a0a05 100644
--- a/config/dbus.c
+++ b/config/dbus.c
@@ -226,7 +226,7 @@ remove_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
* already been removed. */
OsBlockSignals();
ProcessInputEvents();
- DeleteInputDeviceRequest(dev, 0);
+ DeleteInputDeviceRequest(dev);
OsReleaseSignals();
ret = Success;
diff --git a/dix/devices.c b/dix/devices.c
index 2784024..cf23bc6 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -891,7 +891,7 @@ CloseDeviceList(DeviceIntPtr *listHead)
while (dev != NULL)
{
freedIds[dev->id] = TRUE;
- DeleteInputDeviceRequest(dev, DEVICE_REMOVE_ALL);
+ DeleteInputDeviceRequest(dev);
dev = *listHead;
while (dev != NULL && freedIds[dev->id])
diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
index eceb251..568bb88 100644
--- a/hw/dmx/dmxinput.c
+++ b/hw/dmx/dmxinput.c
@@ -114,6 +114,6 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
}
void
-DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags)
+DeleteInputDeviceRequest(DeviceIntPtr pDev)
{
}
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
index cb16176..3797f09 100644
--- a/hw/kdrive/linux/evdev.c
+++ b/hw/kdrive/linux/evdev.c
@@ -165,7 +165,7 @@ EvdevPtrRead (int evdevPort, void *closure)
n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
if (n <= 0) {
if (errno == ENODEV)
- DeleteInputDeviceRequest(pi->dixdev, 0);
+ DeleteInputDeviceRequest(pi->dixdev);
return;
}
@@ -375,7 +375,7 @@ EvdevKbdRead (int evdevPort, void *closure)
n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
if (n <= 0) {
if (errno == ENODEV)
- DeleteInputDeviceRequest(ki->dixdev, 0);
+ DeleteInputDeviceRequest(ki->dixdev);
return;
}
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 51b9b16..d61758f 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -83,7 +83,7 @@ typedef enum {
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(8, 0)
-#define ABI_XINPUT_VERSION SET_ABI_VERSION(11, 0)
+#define ABI_XINPUT_VERSION SET_ABI_VERSION(10, 0)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(4, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index b30ebbb..356ddab 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/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/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c
index 59ca627..90e440e 100644
--- a/hw/xquartz/darwinXinput.c
+++ b/hw/xquartz/darwinXinput.c
@@ -245,7 +245,7 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
*
*/
void
-DeleteInputDeviceRequest(DeviceIntPtr dev, int flags)
+DeleteInputDeviceRequest(DeviceIntPtr dev)
{
DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
}
diff --git a/include/input.h b/include/input.h
index 5426c44..c68a284 100644
--- a/include/input.h
+++ b/include/input.h
@@ -62,9 +62,6 @@ SOFTWARE.
#define DEVICE_OFF 2
#define DEVICE_CLOSE 3
-/* DeleteInputDeviceRequest flags */
-#define DEVICE_REMOVE_ALL (1 << 0) /* all devices will be removed */
-
#define POINTER_RELATIVE (1 << 1)
#define POINTER_ABSOLUTE (1 << 2)
#define POINTER_ACCELERATE (1 << 3)
@@ -539,8 +536,7 @@ extern _X_EXPORT int NewInputDeviceRequest(
InputAttributes *attrs,
DeviceIntPtr *dev);
extern _X_EXPORT void DeleteInputDeviceRequest(
- DeviceIntPtr dev,
- int flags);
+ DeviceIntPtr dev);
extern _X_EXPORT void DDXRingBell(
int volume,
More information about the xorg-commit
mailing list