summaryrefslogtreecommitdiff
path: root/sys/dev/hid
diff options
context:
space:
mode:
authorAnton Lindqvist <anton@cvs.openbsd.org>2022-05-20 05:03:46 +0000
committerAnton Lindqvist <anton@cvs.openbsd.org>2022-05-20 05:03:46 +0000
commite61c11311ce9faad30a97fa32f837cb4f59c7416 (patch)
treec0630589daff3bd40fea65e4236beebb63ed69cb /sys/dev/hid
parentf3e7682b1fb245324eee9fbd4ee72faa1fc6b727 (diff)
Rename hid_none to hid_all as it represents all possible hid kinds by
now.
Diffstat (limited to 'sys/dev/hid')
-rw-r--r--sys/dev/hid/hid.c6
-rw-r--r--sys/dev/hid/hid.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c
index 8611d9219a0..c758764f17a 100644
--- a/sys/dev/hid/hid.c
+++ b/sys/dev/hid/hid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hid.c,v 1.4 2022/05/20 05:02:47 anton Exp $ */
+/* $OpenBSD: hid.c,v 1.5 2022/05/20 05:03:45 anton Exp $ */
/* $NetBSD: hid.c,v 1.23 2002/07/11 21:14:25 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
@@ -229,7 +229,7 @@ hid_get_item(struct hid_data *s, struct hid_item *h)
* Only copy HID item, increment position and return
* if correct kind!
*/
- if (s->kind == hid_none || s->kind == c->kind) {
+ if (s->kind == hid_all || s->kind == c->kind) {
*h = *c;
DPRINTF("%u,%u,%u\n", h->loc.pos,
h->loc.size, h->loc.count);
@@ -637,7 +637,7 @@ hid_is_collection(const void *desc, int size, uint8_t id, int32_t usage)
struct hid_item hi;
uint32_t coll_usage = ~0;
- hd = hid_start_parse(desc, size, hid_none);
+ hd = hid_start_parse(desc, size, hid_all);
DPRINTF("%s: id=%d usage=0x%x\n", __func__, id, usage);
while (hid_get_item(hd, &hi)) {
diff --git a/sys/dev/hid/hid.h b/sys/dev/hid/hid.h
index 28de534124e..7400e920bc2 100644
--- a/sys/dev/hid/hid.h
+++ b/sys/dev/hid/hid.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hid.h,v 1.9 2021/09/01 10:41:39 anton Exp $ */
+/* $OpenBSD: hid.h,v 1.10 2022/05/20 05:03:45 anton Exp $ */
/* $NetBSD: hid.h,v 1.8 2002/07/11 21:14:25 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.h,v 1.7 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -43,7 +43,7 @@ enum hid_kind {
hid_feature,
hid_collection,
hid_endcollection,
- hid_none
+ hid_all
};
struct hid_location {