diff options
| author | Joshua Stein <jcs@cvs.openbsd.org> | 2017-10-10 20:27:13 +0000 |
|---|---|---|
| committer | Joshua Stein <jcs@cvs.openbsd.org> | 2017-10-10 20:27:13 +0000 |
| commit | f3fd48e46039872e75d6efe6a2a58a90b61a2b25 (patch) | |
| tree | 18680745f0fd455e8520ad1037f9580c995a973f | |
| parent | 85cb130bf42792442b59871bc2663b4ddc5d6ece (diff) | |
hidmt: rename internal hidmt_input struct to hidmt_data, avoid clash
with hidmt_input function
| -rw-r--r-- | sys/dev/hid/hidmt.c | 6 | ||||
| -rw-r--r-- | sys/dev/hid/hidmtvar.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/hid/hidmt.c b/sys/dev/hid/hidmt.c index 3898547e0f9..12e5afa5afe 100644 --- a/sys/dev/hid/hidmt.c +++ b/sys/dev/hid/hidmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hidmt.c,v 1.3 2017/10/08 10:13:42 bru Exp $ */ +/* $OpenBSD: hidmt.c,v 1.4 2017/10/10 20:27:12 jcs Exp $ */ /* * HID multitouch driver for devices conforming to Windows Precision Touchpad * standard @@ -167,7 +167,7 @@ hidmt_setup(struct device *self, struct hidmt *mt, void *desc, int dlen) hd = hid_start_parse(desc, dlen, hid_input); while (hid_get_item(hd, &h)) { - struct hidmt_input *input; + struct hidmt_data *input; if (h.report_ID != mt->sc_rep_input) continue; @@ -284,7 +284,7 @@ hidmt_set_input_mode(struct hidmt *mt, int mode) void hidmt_input(struct hidmt *mt, uint8_t *data, u_int len) { - struct hidmt_input *hi; + struct hidmt_data *hi; struct hidmt_contact hc; int32_t d, firstu = 0; int contactcount = 0, seencontacts = 0, tips = 0, i, s, z; diff --git a/sys/dev/hid/hidmtvar.h b/sys/dev/hid/hidmtvar.h index 44928af5ef8..69fd62b00f4 100644 --- a/sys/dev/hid/hidmtvar.h +++ b/sys/dev/hid/hidmtvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hidmtvar.h,v 1.2 2017/10/08 10:13:42 bru Exp $ */ +/* $OpenBSD: hidmtvar.h,v 1.3 2017/10/10 20:27:12 jcs Exp $ */ /* * Copyright (c) 2016 joshua stein <jcs@openbsd.org> * @@ -15,10 +15,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -struct hidmt_input { +struct hidmt_data { int32_t usage; struct hid_location loc; - SIMPLEQ_ENTRY(hidmt_input) entry; + SIMPLEQ_ENTRY(hidmt_data) entry; }; struct hidmt_contact { @@ -49,7 +49,7 @@ struct hidmt { int sc_rep_config; int sc_rep_cap; - SIMPLEQ_HEAD(, hidmt_input) sc_inputs; + SIMPLEQ_HEAD(, hidmt_data) sc_inputs; struct device *sc_wsmousedev; |