 @@ -1,14 +1,14 @@
-/*	$NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $	*/
+/*	$NetBSD: hid.c,v 1.46 2016/10/15 07:10:15 nat Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.46 2016/10/15 07:10:15 nat Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
 @@ -182,27 +182,27 @@ hid_get_item(struct hid_data *s, struct
 		case 2:
 			dval = *data++;
 			dval |= *data++ << 8;
 			dval = (int16_t)dval;
 			break;
 		case 4:
 			dval = *data++;
 			dval |= *data++ << 8;
 			dval |= *data++ << 16;
 			dval |= *data++ << 24;
 			dval = (int32_t)dval;
 			break;
 		default:
-			printf("BAD LENGTH %d\n", bSize);
+			aprint_normal("BAD LENGTH %d\n", bSize);
 			continue;
+		}
 		DPRINTFN(5,("hid_get_item: bType=%d bTag=%d dval=%d\n",
 			 bType, bTag, dval));
 		switch (bType) {
 		case 0:			/* Main */
 			switch (bTag) {
 			case 8:		/* Input */
 				retkind = hid_input;
 			ret:
 				if (s->kind != retkind) {
 					s->minset = 0;
 @@ -250,27 +250,27 @@ hid_get_item(struct hid_data *s, struct
 				hid_clear_local(c);
 				s->nu = 0;
 				return 1;
 			case 11:	/* Feature */
 				retkind = hid_feature;
 				goto ret;
 			case 12:	/* End collection */
 				c->kind = hid_endcollection;
 				c->collevel--;
 				*h = *c;
 				s->nu = 0;
 				return 1;
 			default:
-				printf("Main bTag=%d\n", bTag);
+				aprint_normal("Main bTag=%d\n", bTag);
 				break;
+			}
 			break;
 		case 1:		/* Global */
 			switch (bTag) {
 			case 0:
 				c->_usage_page = dval << 16;
 				break;
 			case 1:
 				c->logical_minimum = dval;
 				break;
 			case 2:
 				c->logical_maximum = dval;
 @@ -302,27 +302,27 @@ hid_get_item(struct hid_data *s, struct
 				*hi = *c;
 				c->next = hi;
 				break;
 			case 11: /* Pop */
 				hi = c->next;
 				if (hi == NULL)
 					break;
 				oldpos = c->loc.pos;
 				*c = *hi;
 				c->loc.pos = oldpos;
 				kmem_free(hi, sizeof(*hi));
 				break;
 			default:
-				printf("Global bTag=%d\n", bTag);
+				aprint_normal("Global bTag=%d\n", bTag);
 				break;
+			}
 			break;
 		case 2:		/* Local */
 			switch (bTag) {
 			case 0:
 				if (bSize == 1)
 					dval = c->_usage_page | (dval&0xff);
 				else if (bSize == 2)
 					dval = c->_usage_page | (dval&0xffff);
 				c->usage = dval;
 				if (s->nu < MAXUSAGE)
 					s->usages[s->nu++] = dval;
 @@ -355,58 +355,59 @@ hid_get_item(struct hid_data *s, struct
 			case 7:
 				c->string_index = dval;
 				break;
 			case 8:
 				c->string_minimum = dval;
 				break;
 			case 9:
 				c->string_maximum = dval;
 				break;
 			case 10:
 				c->set_delimiter = dval;
 				break;
 			default:
-				printf("Local bTag=%d\n", bTag);
+				aprint_normal("Local bTag=%d\n", bTag);
 				break;
+			}
 			break;
 		default:
-			printf("default bType=%d\n", bType);
+			aprint_normal("default bType=%d\n", bType);
 			break;
+		}
+	}
+}
 int
 hid_report_size(const void *buf, int len, enum hid_kind k, uint8_t id)
+{
 	struct hid_data *d;
 	struct hid_item h;
 	int lo, hi;
 	h.report_ID = 0;
 	lo = hi = -1;
 	DPRINTFN(2,("hid_report_size: kind=%d id=%d\n", k, id));
 	for (d = hid_start_parse(buf, len, k); hid_get_item(d, &h); ) {
 		DPRINTFN(2,("hid_report_size: item kind=%d id=%d pos=%d "
 			    "size=%d count=%d\n",
 			    h.kind, h.report_ID, h.loc.pos, h.loc.size,
 			    h.loc.count));
 		if (h.report_ID == id && h.kind == k) {
 			if (lo < 0) {
 				lo = h.loc.pos;
 #ifdef DIAGNOSTIC
 				if (lo != 0) {
-					printf("hid_report_size: lo != 0\n");
+					aprint_normal("hid_report_size:"
 					   " lo != 0\n");
+				}
 #endif
+			}
 			hi = h.loc.pos + h.loc.size * h.loc.count;
 			DPRINTFN(2,("hid_report_size: lo=%d hi=%d\n", lo, hi));
+		}
+	}
 	hid_end_parse(d);
 	return (hi - lo + 7) / 8;
+}
 int
 hid_locate(const void *desc, int size, uint32_t u, uint8_t id, enum hid_kind k,