diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-17 08:37:44 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-18 14:40:54 +1000 |
| commit | 17f9723f488d0470e3879c6b0dfdba61544cdd7b (patch) | |
| tree | 53007679cb8989c8232189c83256c593111f4610 /Xi/xichangehierarchy.c | |
| parent | cbeb73e2055f6c013c8fe6325851f2631170137d (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/xichangehierarchy.c')
| -rw-r--r-- | Xi/xichangehierarchy.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 944bb3017..ef6c39468 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -238,12 +238,6 @@ ProcXIChangeHierarchy(ClientPtr client) r->return_mode != XIFloating) return BadValue; - if (r->deviceid > 0xFF) /* FIXME */ - { - client->errorValue = r->deviceid; - return BadImplementation; - } - rc = dixLookupDevice(&ptr, r->deviceid, client, DixDestroyAccess); if (rc != Success) @@ -344,12 +338,6 @@ ProcXIChangeHierarchy(ClientPtr client) newptr, newkeybd; - if (r->return_pointer > 0xFF) /* FIXME */ - { - client->errorValue = r->deviceid; - return BadImplementation; - } - rc = dixLookupDevice(&newptr, r->return_pointer, client, DixWriteAccess); if (rc != Success) @@ -362,12 +350,6 @@ ProcXIChangeHierarchy(ClientPtr client) goto unwind; } - if (r->return_keyboard > 0xFF) /* FIXME */ - { - client->errorValue = r->deviceid; - return BadImplementation; - } - rc = dixLookupDevice(&newkeybd, r->return_keyboard, client, DixWriteAccess); if (rc != Success) @@ -431,12 +413,6 @@ ProcXIChangeHierarchy(ClientPtr client) xXIDetachSlaveInfo* c = (xXIDetachSlaveInfo*)any; DeviceIntPtr *xtstdevice; - if (c->deviceid > 0xFF) /* FIXME */ - { - client->errorValue = c->deviceid; - return BadImplementation; - } - rc = dixLookupDevice(&ptr, c->deviceid, client, DixWriteAccess); if (rc != Success) @@ -470,17 +446,6 @@ ProcXIChangeHierarchy(ClientPtr client) DeviceIntPtr newmaster; DeviceIntPtr *xtstdevice; - if (c->deviceid > 0xFF) /* FIXME */ - { - client->errorValue = c->deviceid; - return BadImplementation; - } - if (c->new_master > 0xFF) /* FIXME */ - { - client->errorValue = c->new_master; - return BadImplementation; - } - rc = dixLookupDevice(&ptr, c->deviceid, client, DixWriteAccess); if (rc != Success) |