From 9f2b05d5ac552d62127c4b22cd66ff4d0a24dd2b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 22 Aug 2014 10:41:20 +1000 Subject: [PATCH] evdev: prefix the hw key/button bitmask with 'hw' This bitmask reflects the hw state, prefix it accordingly. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- src/evdev.c | 12 ++++++------ src/evdev.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 721238f8..71c52367 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -48,15 +48,15 @@ enum evdev_key_type { }; static void -set_key_down(struct evdev_device *device, int code, int pressed) +hw_set_key_down(struct evdev_device *device, int code, int pressed) { - long_set_bit_state(device->key_mask, code, pressed); + long_set_bit_state(device->hw_key_mask, code, pressed); } static int -is_key_down(struct evdev_device *device, int code) +hw_is_key_down(struct evdev_device *device, int code) { - return long_bit_is_set(device->key_mask, code); + return long_bit_is_set(device->hw_key_mask, code); } static int @@ -385,12 +385,12 @@ evdev_process_key(struct evdev_device *device, break; case EVDEV_KEY_TYPE_KEY: case EVDEV_KEY_TYPE_BUTTON: - if (!is_key_down(device, e->code)) + if (!hw_is_key_down(device, e->code)) return; } } - set_key_down(device, e->code, e->value); + hw_set_key_down(device, e->code, e->value); switch (type) { case EVDEV_KEY_TYPE_NONE: diff --git a/src/evdev.h b/src/evdev.h index 50ca713d..9de44bc8 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -100,7 +100,7 @@ struct evdev_device { /* Bitmask of pressed keys used to ignore initial release events from * the kernel. */ - unsigned long key_mask[NLONGS(KEY_CNT)]; + unsigned long hw_key_mask[NLONGS(KEY_CNT)]; /* Key counter used for multiplexing button events internally in * libinput. */ uint8_t key_count[KEY_CNT]; -- 2.34.1