diff options
author | Sung-Jin Park <sj76.park@samsung.com> | 2012-11-22 03:54:22 -0500 |
---|---|---|
committer | Junfeng Dong <junfeng.dong@intel.com> | 2013-07-12 14:12:48 +0800 |
commit | b435d793b04b06fc9f7d991f9570590e9027427e (patch) | |
tree | 2837ce5e2b599beaf0cf9d07a0fac1dfdfc2dee6 | |
parent | ae35a8bf4e9f8af54eef21d3004495f1c850aecd (diff) | |
download | xorg-x11-drv-evdev-multitouch-b435d793b04b06fc9f7d991f9570590e9027427e.tar.gz xorg-x11-drv-evdev-multitouch-b435d793b04b06fc9f7d991f9570590e9027427e.tar.bz2 xorg-x11-drv-evdev-multitouch-b435d793b04b06fc9f7d991f9570590e9027427e.zip |
Remove a macro and codes attached to it : _F_IGNORE_TSP_RESOLUTION_
Change-Id: I2c62f6c9b6c6d8a10ad18118a2c9ce78d0ebfc71
-rwxr-xr-x | debian/rules | 2 | ||||
-rw-r--r-- | packaging/xorg-x11-drv-evdev-multitouch.spec | 2 | ||||
-rwxr-xr-x | src/evdevmultitouch.c | 16 |
3 files changed, 2 insertions, 18 deletions
diff --git a/debian/rules b/debian/rules index 075991d..369cfe3 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ include debian/xsfbs/xsfbs.mk -CFLAGS = -Wall -g -D_F_IGNORE_TSP_RESOLUTION_ +CFLAGS = -Wall -g CFLAGS += -D_F_GESTURE_EXTENSION_ CFLAGS += -D_F_SUPPORT_PREFERRED_NAME_ #CFLAGS += -D_DEBUG_MT_SEQUENCE_ diff --git a/packaging/xorg-x11-drv-evdev-multitouch.spec b/packaging/xorg-x11-drv-evdev-multitouch.spec index 492ee0b..407a9b8 100644 --- a/packaging/xorg-x11-drv-evdev-multitouch.spec +++ b/packaging/xorg-x11-drv-evdev-multitouch.spec @@ -40,7 +40,7 @@ This package contains xorg evdev multitouch development files %setup -q %build -export CFLAGS+=" -Wall -g -D_F_IGNORE_TSP_RESOLUTION_ -D_F_SUPPORT_PREFERRED_NAME_ -D_F_GESTURE_EXTENSION_ " +export CFLAGS+=" -Wall -g -D_F_SUPPORT_PREFERRED_NAME_ -D_F_GESTURE_EXTENSION_ " %autogen --disable-static %configure --disable-static diff --git a/src/evdevmultitouch.c b/src/evdevmultitouch.c index a4c1ab0..2bc3b5b 100755 --- a/src/evdevmultitouch.c +++ b/src/evdevmultitouch.c @@ -2514,12 +2514,6 @@ EvdevMultitouchCacheCompare(InputInfoPtr pInfo, BOOL compare) */ if( !xf86CheckStrOption(pInfo->options, "Resolution", NULL) ) { -#ifdef _F_IGNORE_TSP_RESOLUTION_ - pEvdevMultitouch->absinfo[ABS_X].maximum = 0; - pEvdevMultitouch->absinfo[ABS_X].minimum = 0; - pEvdevMultitouch->absinfo[ABS_Y].maximum = 0; - pEvdevMultitouch->absinfo[ABS_Y].minimum = 0; -#else//_F_IGNORE_TSP_RESOLUTION_ for (i = ABS_X; i <= ABS_MAX; i++) { if (TestBit(i, abs_bitmask)) { len = ioctl(pInfo->fd, EVIOCGABS(i), &pEvdevMultitouch->absinfo[i]); @@ -2530,7 +2524,6 @@ EvdevMultitouchCacheCompare(InputInfoPtr pInfo, BOOL compare) } } } -#endif//_F_IGNORE_TSP_RESOLUTION_ } len = ioctl(pInfo->fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), key_bitmask); @@ -3149,15 +3142,6 @@ EvdevMultitouchPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) { EvdevMultitouchSwapAxes(pEvdevMultitouch); } -#ifdef _F_IGNORE_TSP_RESOLUTION_ - else - { - pEvdevMultitouch->absinfo[ABS_X].maximum = 0; - pEvdevMultitouch->absinfo[ABS_X].minimum = 0; - pEvdevMultitouch->absinfo[ABS_Y].maximum = 0; - pEvdevMultitouch->absinfo[ABS_Y].minimum = 0; - } -#endif//_F_IGNORE_TSP_RESOLUTION_ // register only the core device EvdevMultitouchAddDevice(pInfo); |