[PATCH synaptics v2 18/21] Clarify rep_buttons assignment

[Daniel Stone]

Instead of a combined variable declaration with two ternary expressions
using raw hex values, expand it to have two genuine if statements,
setting with a more clear bitshift.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/synaptics.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

v2: Unbroken.

diff --git a/src/synaptics.c b/src/synaptics.c
index 37c939e..21b2498 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -2530,8 +2530,12 @@ repeat_scrollbuttons(const InputInfoPtr pInfo,
     SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private);
     SynapticsParameters *para = &priv->synpara;
     int repeat_delay, timeleft;
-    int rep_buttons = ((para->updown_button_repeat ? 0x18 : 0) |
-			(para->leftright_button_repeat ? 0x60 : 0));
+    int rep_buttons = 0;
+
+    if (para->updown_button_repeat)
+        rep_buttons |= (1 << (4 - 1)) | (1 << (5 - 1));
+    if (para->leftright_button_repeat)
+        rep_buttons |= (1 << (6 - 1)) | (1 << (7 - 1));
 
     /* Handle auto repeat buttons */
     repeat_delay = clamp(para->scroll_button_repeat, SBR_MIN, SBR_MAX);
-- 
1.7.5.3