fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2026-05-05 20:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Uncomplicate the setting of axis during slot sync

Browse source 
A few bytes get wasted, but no magic handling of offsets etc are required.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-12 22:17:13 +10:00
parent c04f5bcec0
commit 6430694715
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libevdev/libevdev.c
View file

@ -660,7 +660,7 @@ sync_mt_state(struct libevdev *dev, int create_events)
int rc; int rc;
int axis, slot; int axis, slot;
int last_reported_slot = 0; int last_reported_slot = 0;
unsigned long slot_update[NLONGS(dev->num_slots * ABS_MT_CNT)]; unsigned long slot_update[dev->num_slots][NLONGS(ABS_CNT)];
unsigned long tracking_id_changes[NLONGS(dev->num_slots)]; unsigned long tracking_id_changes[NLONGS(dev->num_slots)];
int need_tracking_id_changes = 0; int need_tracking_id_changes = 0;
@ -668,8 +668,6 @@ sync_mt_state(struct libevdev *dev, int create_events)
memset(slot_update, 0, sizeof(slot_update)); memset(slot_update, 0, sizeof(slot_update));
memset(tracking_id_changes, 0, sizeof(tracking_id_changes)); memset(tracking_id_changes, 0, sizeof(tracking_id_changes));
#define AXISBIT(_slot, _axis) (_slot * ABS_MT_CNT + _axis - ABS_MT_MIN)
for (axis = ABS_MT_MIN; axis <= ABS_MT_MAX; axis++) { for (axis = ABS_MT_MIN; axis <= ABS_MT_MAX; axis++) {
/* EVIOCGMTSLOTS required format */ /* EVIOCGMTSLOTS required format */
struct mt_sync_state { struct mt_sync_state {
@ -701,9 +699,9 @@ sync_mt_state(struct libevdev *dev, int create_events)
*slot_value(dev, slot, axis) = mt_state.val[slot]; *slot_value(dev, slot, axis) = mt_state.val[slot];
set_bit(slot_update, AXISBIT(slot, axis)); set_bit(slot_update[slot], axis);
/* note that this slot has updates */ /* note that this slot has updates */
set_bit(slot_update, AXISBIT(slot, ABS_MT_SLOT)); set_bit(slot_update[slot], ABS_MT_SLOT);
} }
} }
@ -727,7 +725,7 @@ sync_mt_state(struct libevdev *dev, int create_events)
} }
for (slot = 0; slot < dev->num_slots; slot++) { for (slot = 0; slot < dev->num_slots; slot++) {
if (!bit_is_set(slot_update, AXISBIT(slot, ABS_MT_SLOT))) if (!bit_is_set(slot_update[slot], ABS_MT_SLOT))
continue; continue;
queue_push_event(dev, EV_ABS, ABS_MT_SLOT, slot); queue_push_event(dev, EV_ABS, ABS_MT_SLOT, slot);
@ -738,7 +736,7 @@ sync_mt_state(struct libevdev *dev, int create_events)
!libevdev_has_event_code(dev, EV_ABS, axis)) !libevdev_has_event_code(dev, EV_ABS, axis))
continue; continue;
if (bit_is_set(slot_update, AXISBIT(slot, axis))) if (bit_is_set(slot_update[slot], axis))
queue_push_event(dev, EV_ABS, axis, queue_push_event(dev, EV_ABS, axis,
*slot_value(dev, slot, axis)); *slot_value(dev, slot, axis));
} }
@ -756,8 +754,6 @@ sync_mt_state(struct libevdev *dev, int create_events)
if (dev->current_slot != last_reported_slot) if (dev->current_slot != last_reported_slot)
queue_push_event(dev, EV_ABS, ABS_MT_SLOT, dev->current_slot); queue_push_event(dev, EV_ABS, ABS_MT_SLOT, dev->current_slot);
#undef AXISBIT
rc = 0; rc = 0;
out: out:
return rc ? -errno : 0; return rc ? -errno : 0;