frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 531ff40301.
This commit is contained in:
Keith Packard 2010-05-26 07:54:35 -07:00
parent 531ff40301
commit 4e9d3e4132
10 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/stubs.c
View File

@ -241,6 +241,6 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
* *
*/ */
void void
DeleteInputDeviceRequest(DeviceIntPtr dev, int flags) DeleteInputDeviceRequest(DeviceIntPtr dev)
{ {
} }

2
config/config.c
View File

@ -81,7 +81,7 @@ remove_device(const char *backend, DeviceIntPtr dev)
* already been removed. */ * already been removed. */
OsBlockSignals(); OsBlockSignals();
ProcessInputEvents(); ProcessInputEvents();
DeleteInputDeviceRequest(dev, 0); DeleteInputDeviceRequest(dev);
OsReleaseSignals(); OsReleaseSignals();
} }

2
config/dbus.c
View File

@ -226,7 +226,7 @@ remove_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
* already been removed. */ * already been removed. */
OsBlockSignals(); OsBlockSignals();
ProcessInputEvents(); ProcessInputEvents();
DeleteInputDeviceRequest(dev, 0); DeleteInputDeviceRequest(dev);
OsReleaseSignals(); OsReleaseSignals();
ret = Success; ret = Success;

2
dix/devices.c
View File

@ -891,7 +891,7 @@ CloseDeviceList(DeviceIntPtr *listHead)
while (dev != NULL) while (dev != NULL)
{ {
freedIds[dev->id] = TRUE; freedIds[dev->id] = TRUE;
DeleteInputDeviceRequest(dev, DEVICE_REMOVE_ALL); DeleteInputDeviceRequest(dev);
dev = *listHead; dev = *listHead;
while (dev != NULL && freedIds[dev->id]) while (dev != NULL && freedIds[dev->id])

2
hw/dmx/dmxinput.c
View File

@ -114,6 +114,6 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
} }
void void
DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags) DeleteInputDeviceRequest(DeviceIntPtr pDev)
{ {
} }

4
hw/kdrive/linux/evdev.c
View File

@ -165,7 +165,7 @@ EvdevPtrRead (int evdevPort, void *closure)
n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event)); n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
if (n <= 0) { if (n <= 0) {
if (errno == ENODEV) if (errno == ENODEV)
DeleteInputDeviceRequest(pi->dixdev, 0); DeleteInputDeviceRequest(pi->dixdev);
return; return;
} }
@ -375,7 +375,7 @@ EvdevKbdRead (int evdevPort, void *closure)
n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event)); n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
if (n <= 0) { if (n <= 0) {
if (errno == ENODEV) if (errno == ENODEV)
DeleteInputDeviceRequest(ki->dixdev, 0); DeleteInputDeviceRequest(ki->dixdev);
return; return;
} }

2
hw/xfree86/common/xf86Module.h
View File

@ -83,7 +83,7 @@ typedef enum {
*/ */
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(8, 0) #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_EXTENSION_VERSION SET_ABI_VERSION(4, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)

8
hw/xfree86/common/xf86Xinput.c
View File

@ -854,7 +854,7 @@ unwind:
} }
void void
DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags) DeleteInputDeviceRequest(DeviceIntPtr pDev)
{ {
LocalDevicePtr pInfo = (LocalDevicePtr) pDev->public.devicePrivate; LocalDevicePtr pInfo = (LocalDevicePtr) pDev->public.devicePrivate;
InputDriverPtr drv = NULL; InputDriverPtr drv = NULL;
@ -874,9 +874,9 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags)
if (!isMaster && pInfo != NULL) if (!isMaster && pInfo != NULL)
{ {
if(drv->UnInit) if(drv->UnInit)
drv->UnInit(drv, pInfo, flags); drv->UnInit(drv, pInfo, 0);
else else
xf86DeleteInput(pInfo, flags); xf86DeleteInput(pInfo, 0);
/* devices added through HAL aren't in the config layout */ /* devices added through HAL aren't in the config layout */
it = xf86ConfigLayout.inputs; it = xf86ConfigLayout.inputs;
@ -1267,7 +1267,7 @@ xf86DisableDevice(DeviceIntPtr dev, Bool panic)
} else } else
{ {
SendDevicePresenceEvent(dev->id, DeviceUnrecoverable); SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);
DeleteInputDeviceRequest(dev, 0); DeleteInputDeviceRequest(dev);
} }
} }

2
hw/xquartz/darwinXinput.c
View File

@ -245,7 +245,7 @@ NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
* *
*/ */
void void
DeleteInputDeviceRequest(DeviceIntPtr dev, int flags) DeleteInputDeviceRequest(DeviceIntPtr dev)
{ {
DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev); DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
} }

6
include/input.h
View File

@ -62,9 +62,6 @@ SOFTWARE.
#define DEVICE_OFF 2 #define DEVICE_OFF 2
#define DEVICE_CLOSE 3 #define DEVICE_CLOSE 3
/* DeleteInputDeviceRequest flags */
#define DEVICE_REMOVE_ALL (1 << 0) /* all devices will be removed */
#define POINTER_RELATIVE (1 << 1) #define POINTER_RELATIVE (1 << 1)
#define POINTER_ABSOLUTE (1 << 2) #define POINTER_ABSOLUTE (1 << 2)
#define POINTER_ACCELERATE (1 << 3) #define POINTER_ACCELERATE (1 << 3)
@ -539,8 +536,7 @@ extern _X_EXPORT int NewInputDeviceRequest(
InputAttributes *attrs, InputAttributes *attrs,
DeviceIntPtr *dev); DeviceIntPtr *dev);
extern _X_EXPORT void DeleteInputDeviceRequest( extern _X_EXPORT void DeleteInputDeviceRequest(
DeviceIntPtr dev, DeviceIntPtr dev);
int flags);
extern _X_EXPORT void DDXRingBell( extern _X_EXPORT void DDXRingBell(
int volume, int volume,