diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-05-07 08:35:19 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-05-07 08:35:19 +0000 |
| commit | 86be96de294eee8f87de973dafb8944b25e25285 (patch) | |
| tree | 0ff4b45e0c6adf33c43f97db3e613945699404c5 /driver/xf86-input-acecad/src/acecad.h | |
| parent | 4ccd4dfeb65a2b59ef69432e192b2d7ef99ac61c (diff) | |
Update to xf86-input-acecad 1.5.0.
Diffstat (limited to 'driver/xf86-input-acecad/src/acecad.h')
| -rw-r--r-- | driver/xf86-input-acecad/src/acecad.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/driver/xf86-input-acecad/src/acecad.h b/driver/xf86-input-acecad/src/acecad.h index c4befb9c4..a2b5c669b 100644 --- a/driver/xf86-input-acecad/src/acecad.h +++ b/driver/xf86-input-acecad/src/acecad.h @@ -100,21 +100,23 @@ static Bool DeviceOn (DeviceIntPtr); static Bool DeviceOff (DeviceIntPtr); static Bool DeviceClose (DeviceIntPtr); static Bool DeviceInit (DeviceIntPtr); -static void ReadInput (LocalDevicePtr); -static void CloseProc (LocalDevicePtr); -static Bool ConvertProc (LocalDevicePtr, int, int, int, int, int, int, int, int, int *, int *); -static Bool ReverseConvertProc(LocalDevicePtr , int , int , int*); +static void ReadInput (InputInfoPtr); +static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, int *, int *); +static Bool ReverseConvertProc(InputInfoPtr , int , int , int*); static Bool QueryHardware (AceCadPrivatePtr); static void NewPacket (AceCadPrivatePtr priv); static Bool AceCadGetPacket (AceCadPrivatePtr); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 static InputInfoPtr AceCadPreInit(InputDriverPtr, IDevPtr , int); -#ifdef LINUX_INPUT -static void USBReadInput (LocalDevicePtr); -static Bool USBQueryHardware (LocalDevicePtr); +#else +static int AceCadPreInit(InputDriverPtr, InputInfoPtr , int); +#endif +#ifdef HAVE_LINUX_INPUT_H +static void USBReadInput (InputInfoPtr); +static Bool USBQueryHardware (InputInfoPtr); static int IsUSBLine(int); static Bool fd_query_acecad(int, char*); -static Bool AceCadAutoDevProbe(LocalDevicePtr, int); +static Bool AceCadAutoDevProbe(InputInfoPtr, int); #endif - #endif |