glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

evdev: decode EV_SW unconditionally

Browse Source 
* evdev.c (bit_ioctl): Remove [EV_SW] check.
* tests/ioctl_evdev.c [!EV_SW] (EV_SW): Define.
(main): Remove [EV_SW] check.
This commit is contained in:
Eugene Syromyatnikov 2018-03-30 22:20:24 +02:00 committed by Dmitry V. Levin
parent 3dbe33a872
commit 2cc71623b9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evdev.c
View File

@ -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_???");

6
tests/ioctl_evdev.c
View File

@ -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));