Remove a macro and codes attached to it : _F_IGNORE_TSP_RESOLUTION_

Change-Id: I2c62f6c9b6c6d8a10ad18118a2c9ce78d0ebfc71

diff --git a/debian/rules b/debian/rules
index 075991d..369cfe3 100755 (executable)
--- 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 (file)
--- 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 (executable)
--- 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);