Module Name: src
Committed By: christos
Date: Sun Jun 3 14:41:05 UTC 2018
Modified Files:
src/sys/dev/pckbport: synaptics.c
Log Message:
use a more data-driven :-) approach to avoid cut-n-pasted code.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pckbport/synaptics.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.39 src/sys/dev/pckbport/synaptics.c:1.40
--- src/sys/dev/pckbport/synaptics.c:1.39 Sun Jun 3 03:24:18 2018
+++ src/sys/dev/pckbport/synaptics.c Sun Jun 3 10:41:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.39 2018/06/03 07:24:18 ryoon Exp $ */
+/* $NetBSD: synaptics.c,v 1.40 2018/06/03 14:41:05 christos Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.39 2018/06/03 07:24:18 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.40 2018/06/03 14:41:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -297,6 +297,24 @@ pms_synaptics_probe_extended(struct pms_
}
}
+static const struct {
+ int bit;
+ const char *desc;
+} syn_flags[] = {
+ { SYN_FLAG_HAS_EXTENDED_WMODE, "Extended W mode", },
+ { SYN_FLAG_HAS_PASSTHROUGH, "Passthrough", },
+ { SYN_FLAG_HAS_MIDDLE_BUTTON, "Middle button", },
+ { SYN_FLAG_HAS_BUTTONS_4_5, "Buttons 4/5", },
+ { SYN_FLAG_HAS_UP_DOWN_BUTTONS, "Up/down buttons", },
+ { SYN_FLAG_HAS_PALM_DETECT, "Palm detect", },
+ { SYN_FLAG_HAS_ONE_BUTTON_CLICKPAD, "One button click pad", },
+ { SYN_FLAG_HAS_TWO_BUTTON_CLICKPAD, "Two button click pad", },
+ { SYN_FLAG_HAS_VERTICAL_SCROLL, "Vertical scroll", },
+ { SYN_FLAG_HAS_HORIZONTAL_SCROLL, "Horizontal scroll", },
+ { SYN_FLAG_HAS_MULTI_FINGER_REPORT, "Multi-finger Report", },
+ { SYN_FLAG_HAS_MULTI_FINGER, "Multi-finger", },
+};
+
int
pms_synaptics_probe_init(void *vsc)
{
@@ -368,54 +386,12 @@ pms_synaptics_probe_init(void *vsc)
const char comma[] = ", ";
const char *sep = "";
aprint_normal_dev(psc->sc_dev, "");
- if (sc->flags & SYN_FLAG_HAS_EXTENDED_WMODE) {
- aprint_normal("%sExtended W mode", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_PASSTHROUGH) {
- aprint_normal("%sPassthrough", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_MIDDLE_BUTTON) {
- aprint_normal("%sMiddle button", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_BUTTONS_4_5) {
- aprint_normal("%sButtons 4/5", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_UP_DOWN_BUTTONS) {
- aprint_normal("%sUp/down buttons", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_PALM_DETECT) {
- aprint_normal("%sPalm detect", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_ONE_BUTTON_CLICKPAD) {
- aprint_normal("%sOne button click pad", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_TWO_BUTTON_CLICKPAD) {
- aprint_normal("%sTwo button click pad", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_VERTICAL_SCROLL) {
- aprint_normal("%sVertical scroll", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_HORIZONTAL_SCROLL) {
- aprint_normal("%sHorizontal scroll", sep);
- sep = comma;
- }
- if (sc->flags & SYN_FLAG_HAS_MULTI_FINGER_REPORT) {
- aprint_normal("%sMulti-finger Report", sep);
- sep = comma;
+ for (size_t f = 0; f < __arraycount(syn_flags); f++) {
+ if (sc->flags & syn_flags[f].bit) {
+ aprint_normal("%s%s", sep, syn_flags[f].desc);
+ sep = comma;
+ }
}
- if (sc->flags & SYN_FLAG_HAS_MULTI_FINGER)
- aprint_normal("%sMulti-finger", sep);
-
- aprint_normal("\n");
}
done:
@@ -437,8 +413,8 @@ pms_synaptics_enable(void *vsc)
if (sc->flags & SYN_FLAG_HAS_PASSTHROUGH) {
/*
- * Extended capability probes can confuse the passthrough device;
- * reset the touchpad now to cure that.
+ * Extended capability probes can confuse the passthrough
+ * device; reset the touchpad now to cure that.
*/
res = synaptics_poll_reset(psc);
}
@@ -477,46 +453,23 @@ pms_synaptics_enable(void *vsc)
/*
* Enable multi-finger capability in cold boot case with
- * undocumented dequence.
+ * undocumented sequence.
* Parameters from
* https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller/
* VoodooPS2Trackpad/VoodooPS2SynapticsTouchPad.cpp
* setTouchPadModeByte function.
*/
if (sc->flags & SYN_FLAG_HAS_EXTENDED_WMODE) {
- cmd[0] = 0xe6;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0xe8;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0x00;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0xe8;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0x00;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0xe8;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0x00;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0xe8;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0x03;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0xf3;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
- cmd[0] = 0xc8;
- (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
- cmd, 1, 3, resp, 0);
+ static const uint8_t seq[] = {
+ 0xe6, 0xe8, 0x00, 0xe8, 0x00,
+ 0xe8, 0x00, 0xe8, 0x03, 0xf3,
+ 0xc8,
+ };
+ for (size_t s = 0; s < __arraycount(seq); s++) {
+ cmd[0] = seq[s];
+ (void)pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot,
+ cmd, 1, 3, resp, 0);
+ }
}
synaptics_poll_cmd(psc, PMS_DEV_ENABLE, 0);
