evdev: decode EV_SW unconditionally

* evdev.c (bit_ioctl): Remove [EV_SW] check.
* tests/ioctl_evdev.c [!EV_SW] (EV_SW): Define.
(main): Remove [EV_SW] check.

diff --git a/evdev.c b/evdev.c
index 674c1c05d93d4f1805cd0662126b481e27e68ccf..ccf41a19fa379e47a863df3519691946a7b8a4bf 100644 (file)
--- a/evdev.c
+++ b/evdev.c
@@ -264,11 +264,9 @@ bit_ioctl(struct tcb *const tcp, const unsigned int ev_nr,
                case EV_MSC:
                        return decode_bitset(tcp, arg, evdev_misc,
                                             MSC_MAX, "MSC_???");
-# ifdef EV_SW
                case EV_SW:
                        return decode_bitset(tcp, arg, evdev_switch,
                                             SW_MAX, "SW_???");
-# endif
                case EV_LED:
                        return decode_bitset(tcp, arg, evdev_leds,
                                             LED_MAX, "LED_???");

diff --git a/tests/ioctl_evdev.c b/tests/ioctl_evdev.c
index 9d16cecf0877febd26f437572e3b2b738de13dfc..5645cb4537c02718ae31bcb05ab4ea93c4cb0bde 100644 (file)
--- a/tests/ioctl_evdev.c
+++ b/tests/ioctl_evdev.c
@@ -39,6 +39,10 @@
 # include <sys/ioctl.h>
 # include <linux/input.h>
 
+# ifndef EV_SW
+#  define EV_SW 5
+# endif
+
 static const unsigned int magic = 0xdeadbeef;
 static const unsigned long lmagic = (unsigned long) 0xdeadbeefbadc0dedULL;
 
@@ -122,9 +126,7 @@ main(void)
        TEST_NULL_ARG(EVIOCGBIT(EV_REL, 2));
        TEST_NULL_ARG(EVIOCGBIT(EV_ABS, 3));
        TEST_NULL_ARG(EVIOCGBIT(EV_MSC, 4));
-# ifdef EV_SW
        TEST_NULL_ARG(EVIOCGBIT(EV_SW, 5));
-# endif
        TEST_NULL_ARG(EVIOCGBIT(EV_LED, 6));
        TEST_NULL_ARG(EVIOCGBIT(EV_SND, 7));
        TEST_NULL_ARG(EVIOCGBIT(EV_REP, 8));