andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix/devices: clean up debugging

Browse Source
This commit is contained in:
Daniel Stone 2006-10-08 18:26:26 +03:00 committed by Daniel Stone
parent 4493acb88c
commit c2fab469b6
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dix/devices.c
View File

@ -149,9 +149,6 @@ EnableDevice(register DeviceIntPtr dev)
if ((*prev != dev) || !dev->inited || if ((*prev != dev) || !dev->inited ||
((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) { ((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) {
ErrorF("couldn't enable device %d\n", dev->id); ErrorF("couldn't enable device %d\n", dev->id);
#ifdef DEBUG
ErrorF("prev is %p, dev is %p, dev->inited is %d, ret is %d\n", prev, dev, dev->inited, ret);
#endif
return FALSE; return FALSE;
} }
*prev = dev->next; *prev = dev->next;
@ -365,25 +362,15 @@ InitAndStartDevices()
register DeviceIntPtr dev, next; register DeviceIntPtr dev, next;
for (dev = inputInfo.off_devices; dev; dev = dev->next) { for (dev = inputInfo.off_devices; dev; dev = dev->next) {
#ifdef DEBUG DebugF("(dix) initialising device %d\n", dev->id);
ErrorF("(dix) initialising device %d\n", dev->id);
#endif
ActivateDevice(dev); ActivateDevice(dev);
#ifdef DEBUG
ErrorF("(dix) finished device %d, inited is %d\n", dev->id, dev->inited);
#endif
} }
for (dev = inputInfo.off_devices; dev; dev = next) for (dev = inputInfo.off_devices; dev; dev = next)
{ {
#ifdef DEBUG DebugF("(dix) enabling device %d\n", dev->id);
ErrorF("(dix) enabling device %d\n", dev->id);
#endif
next = dev->next; next = dev->next;
if (dev->inited && dev->startup) if (dev->inited && dev->startup)
(void)EnableDevice(dev); (void)EnableDevice(dev);
#ifdef DEBUG
ErrorF("(dix) finished device %d\n", dev->id);
#endif
} }
for (dev = inputInfo.devices; for (dev = inputInfo.devices;
dev && (dev != inputInfo.keyboard); dev && (dev != inputInfo.keyboard);
@ -527,9 +514,7 @@ RemoveDevice(DeviceIntPtr dev)
DeviceIntRec dummyDev; DeviceIntRec dummyDev;
#endif #endif
#ifdef DEBUG DebugF("(dix) removing device %d\n", dev->id);
ErrorF("want to remove device %p, kb is %p, pointer is %p\n", dev, inputInfo.keyboard, inputInfo.pointer);
#endif
if (!dev || dev == inputInfo.keyboard || dev == inputInfo.pointer) if (!dev || dev == inputInfo.keyboard || dev == inputInfo.pointer)
return BadImplementation; return BadImplementation;