refactor: Use the bitmask_t type

Use the bitmask_t for all bitfields, to simplify future expansions
to larger bit fields.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gestures.c b/src/gestures.c
index 2dafe79..0cc2e0b 100644
--- a/src/gestures.c
+++ b/src/gestures.c
@@ -38,7 +38,7 @@ static const int BUTTON_HOLD_MS = 200;
  */
 static void extract_buttons(struct Gestures *gs, struct MTouch* mt)
 {
-        unsigned btdata = mt->state.button & BITONES(DIM_BUTTON);
+        bitmask_t btdata = mt->state.button & BITONES(DIM_BUTTON);
         int npoint = bitcount(mt->mem.pointing);
         if (mt->state.button == BITMASK(MT_BUTTON_LEFT)) {
                 if (npoint == 2)
diff --git a/src/memory.c b/src/memory.c
index 39621da..4cfb7da 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -61,7 +61,7 @@ static void update_configuration(struct Memory *m,
                                  const struct MTState *state)
 {
         const struct MTFinger *f = state->finger;
-        unsigned fingers = BITONES(state->nfinger);
+        bitmask_t fingers = BITONES(state->nfinger);
         int i;
         m->added = 0;
         foreach_bit(i, fingers)