diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:07 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:07 +0000 |
| commit | 0844ad65b30084a4ed176f947f6a8a0089b34e4c (patch) | |
| tree | 2dc048cca7cb6ee2b2f7e86c4e172832246c9d55 | |
| parent | 2c9a7240ca8252c0fb87265dd105c0750dcb5f12 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE
| -rw-r--r-- | src/xf86Elo.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/xf86Elo.c b/src/xf86Elo.c index 004b8b4..09ceb40 100644 --- a/src/xf86Elo.c +++ b/src/xf86Elo.c @@ -1165,13 +1165,13 @@ xf86EloPrintIdent(unsigned char *packet, * *************************************************************************** */ -#if 0 + static void xf86EloPtrControl(DeviceIntPtr dev, PtrCtrl *ctrl) { } -#endif + /* @@ -1283,7 +1283,10 @@ xf86EloControl(DeviceIntPtr dev, ErrorF("Unable to allocate Elographics touchscreen FocusClassDeviceStruct\n"); return !Success; } - + if (InitPtrFeedbackClassDeviceStruct(dev, xf86EloPtrControl) == FALSE) { + ErrorF("unable to init ptr feedback\n"); + return !Success; + } /* * Device reports motions on 2 axes in absolute coordinates. * Axes min and max values are reported in raw coordinates. @@ -1466,7 +1469,11 @@ xf86EloControl(DeviceIntPtr dev, DBG(2, ErrorF("Elographics touchscreen close...\n")); dev->public.on = FALSE; if (local->fd >= 0) { - RemoveEnabledDevice(local->fd); +#ifdef XFREE86_V4 + xf86RemoveEnabledDevice(local); +#else + RemoveEnabledDevice(local->fd); +#endif } SYSCALL(close(local->fd)); local->fd = -1; @@ -1772,7 +1779,7 @@ static XF86ModuleVersionInfo version_rec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, |