summaryrefslogtreecommitdiff
path: root/Xi/xiproperty.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-17 08:37:44 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-18 14:40:54 +1000
commit17f9723f488d0470e3879c6b0dfdba61544cdd7b (patch)
tree53007679cb8989c8232189c83256c593111f4610 /Xi/xiproperty.c
parentcbeb73e2055f6c013c8fe6325851f2631170137d (diff)
input: bump to ints for deviceids - XI2 requires 16-bit deviceids.
Note: ABI break, but ABI_XINPUT_VERSION has NOT been bumped. Recompile input drivers. Revert "Xi: return BadImplementation for deviceids 256 and above" This reverts commit 2b459f44f3edaea137df9a28bc7adfeb1b9f1df7. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi/xiproperty.c')
-rw-r--r--Xi/xiproperty.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index dc54d10fe..cd4946026 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -1102,12 +1102,6 @@ ProcXIListProperties(ClientPtr client)
REQUEST(xXIListPropertiesReq);
REQUEST_SIZE_MATCH(xXIListPropertiesReq);
- if (stuff->deviceid > 0xFF) /* FIXME */
- {
- client->errorValue = stuff->deviceid;
- return BadImplementation;
- }
-
rc = dixLookupDevice (&dev, stuff->deviceid, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -1142,12 +1136,6 @@ ProcXIChangeProperty(ClientPtr client)
REQUEST(xXIChangePropertyReq);
REQUEST_AT_LEAST_SIZE(xXIChangePropertyReq);
-
- if (stuff->deviceid > 0xFF) /* FIXME */
- {
- client->errorValue = stuff->deviceid;
- return BadImplementation;
- }
UpdateCurrentTime();
rc = dixLookupDevice (&dev, stuff->deviceid, client, DixWriteAccess);
@@ -1176,13 +1164,6 @@ ProcXIDeleteProperty(ClientPtr client)
REQUEST(xXIDeletePropertyReq);
REQUEST_SIZE_MATCH(xXIDeletePropertyReq);
-
- if (stuff->deviceid > 0xFF) /* FIXME */
- {
- client->errorValue = stuff->deviceid;
- return BadImplementation;
- }
-
UpdateCurrentTime();
rc = dixLookupDevice (&dev, stuff->deviceid, client, DixWriteAccess);
if (rc != Success)
@@ -1211,13 +1192,6 @@ ProcXIGetProperty(ClientPtr client)
Atom type;
REQUEST_SIZE_MATCH(xXIGetPropertyReq);
-
- if (stuff->deviceid > 0xFF) /* FIXME */
- {
- client->errorValue = stuff->deviceid;
- return BadImplementation;
- }
-
if (stuff->delete)
UpdateCurrentTime();
rc = dixLookupDevice (&dev, stuff->deviceid, client,