diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-03 21:28:26 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-05 16:13:03 +0930 |
| commit | d10ba4591a599a317093ffcbdd7cece11ab6de26 (patch) | |
| tree | 65224f07c95e9fb718b2b5495bc93ee4eafb8c51 /hw/dmx | |
| parent | 8d4d0b47a07a298a20ffae9fefe96c8c7ca9dccc (diff) | |
dmx: some more build fixes.
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 12 | ||||
| -rw-r--r-- | hw/dmx/input/dmxxinput.c | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 277e164a3..1adfb41cd 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -476,15 +476,11 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) break; } if (info.keyClass) { -#if 00 /*BP*/ - InitKeyClassDeviceStruct(pDevice, &info.keySyms, info.modMap); -#else DevicePtr pDev = (DevicePtr) pDevice; InitKeyboardDeviceStruct(pDev, &info.keySyms, info.modMap, dmxBell, dmxKbdCtrl); -#endif } if (info.buttonClass) { InitButtonClassDeviceStruct(pDevice, info.numButtons, info.map); @@ -492,13 +488,7 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) if (info.valuatorClass) { if (info.numRelAxes && dmxLocal->sendsCore) { InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, -#if 00 /*BP*/ - miPointerGetMotionEvents, - miPointerGetMotionBufferSize(), -#else - GetMotionHistory, GetMaximumEventsNum(), -#endif Relative); for (i = 0; i < info.numRelAxes; i++) InitValuatorAxisStruct(pDevice, i, info.minval[0], @@ -506,7 +496,6 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) info.minres[0], info.maxres[0]); } else if (info.numRelAxes) { InitValuatorClassDeviceStruct(pDevice, info.numRelAxes, - dmxPointerGetMotionEvents, dmxPointerGetMotionBufferSize(), Relative); for (i = 0; i < info.numRelAxes; i++) @@ -515,7 +504,6 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) info.minres[0], info.maxres[0]); } else if (info.numAbsAxes) { InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes, - dmxPointerGetMotionEvents, dmxPointerGetMotionBufferSize(), Absolute); for (i = 0; i < info.numAbsAxes; i++) diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c index 692e647bf..97f43927a 100644 --- a/hw/dmx/input/dmxxinput.c +++ b/hw/dmx/input/dmxxinput.c @@ -93,12 +93,9 @@ int ChangePointerDevice(DeviceIntPtr old_dev, /* Switch the motion history buffers */ if (dmxLocalOld->savedMotionProc) { - old_dev->valuator->GetMotionProc = dmxLocalOld->savedMotionProc; old_dev->valuator->numMotionEvents = dmxLocalOld->savedMotionEvents; } - dmxLocalNew->savedMotionProc = new_dev->valuator->GetMotionProc; dmxLocalNew->savedMotionEvents = new_dev->valuator->numMotionEvents; - new_dev->valuator->GetMotionProc = GetMotionHistory; new_dev->valuator->numMotionEvents = GetMaximumEventsNum(); /* Switch our notion of core pointer */ dmxLocalOld->isCore = 0; |