 @@ -1,14 +1,14 @@
-/*	$NetBSD: hid.h,v 1.3 2018/11/15 23:01:45 jakllsch Exp $	*/
+/*	$NetBSD: hid.h,v 1.3.4.1 2020/07/15 14:09:04 martin Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/hid.h,v 1.7 1999/11/17 22:33:40 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:
 @@ -113,27 +113,28 @@ int hid_is_collection(const void *, int,
 #define HUP_UNICODE		0x0010
 #define HUP_ALPHANUM_DISPLAY	0x0014
 #define HUP_MONITOR		0x0080
 #define HUP_MONITOR_ENUM_VAL	0x0081
 #define HUP_VESA_VC		0x0082
 #define HUP_VESA_CMD		0x0083
 #define HUP_POWER		0x0084
 #define HUP_BATTERY		0x0085
 #define HUP_BARCODE_SCANNER	0x008b
 #define HUP_SCALE		0x008c
 #define HUP_CAMERA_CONTROL	0x0090
 #define HUP_ARCADE		0x0091
 #define HUP_VENDOR		0x00ff
-#define HUP_MICROSOFT		0xff00
+#define HUP_FIDO		0xf1d0U
 #define HUP_MICROSOFT		0xff00U
 /* XXX compat */
 #define HUP_APPLE		0x00ff
 #define HUP_WACOM		0xff00
 /* Usages, Power Device */
 #define HUP_INAME		0x0001
 #define HUP_PRESENT_STATUS	0x0002
 #define HUP_CHANGED_STATUS	0x0003
 #define HUP_UPS			0x0004
 #define HUP_POWER_SUPPLY	0x0005
 #define HUP_BATTERY_SYSTEM	0x0010
 #define HUP_BATTERY_SYSTEM_ID	0x0011
 #define HUP_PD_BATTERY		0x0012
 @@ -386,26 +387,29 @@ int hid_is_collection(const void *, int,
 #define HUD_SCAN_TIME		0x0056
 #define HUD_BUTTON_TYPE		0x0059
 /* Usages, LED */
 #define HUD_LED_NUM_LOCK	0x0001
 #define HUD_LED_CAPS_LOCK	0x0002
 #define HUD_LED_SCROLL_LOCK	0x0003
 #define HUD_LED_COMPOSE		0x0004
 #define HUD_LED_KANA		0x0005
 /* Usages, Consumer */
 #define HUC_AC_PAN		0x0238
 /* Usages, FIDO */
 #define HUF_U2FHID		0x0001
 #define HID_USAGE2(p, u) (((p) << 16) | u)
 #define HID_GET_USAGE(u) ((u) & 0xffff)
 #define HID_GET_USAGE_PAGE(u) (((u) >> 16) & 0xffff)
 #define HCOLL_PHYSICAL		0
 #define HCOLL_APPLICATION	1
 #define HCOLL_LOGICAL		2
 /* Bits in the input/output/feature items */
 #define HIO_CONST	0x001
 #define HIO_VARIABLE	0x002
 #define HIO_RELATIVE	0x004
 #define HIO_WRAP	0x008

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhid.c,v 1.108.2.1 2020/01/02 09:42:06 martin Exp $	*/
+/*	$NetBSD: uhid.c,v 1.108.2.2 2020/07/15 14:09:04 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2008, 2012 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 and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.108.2.1 2020/01/02 09:42:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.108.2.2 2020/07/15 14:09:04 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/signalvar.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 @@ -94,26 +94,27 @@ struct uhid_softc {
 	int sc_fsize;
 	u_char *sc_obuf;
 	struct clist sc_q;	/* protected by sc_lock */
 	struct selinfo sc_rsel;
 	proc_t *sc_async;	/* process that wants SIGIO */
 	void *sc_sih;
 	u_char sc_state;	/* driver state */
 #define	UHID_ASLP	0x01	/* waiting for device data */
 #define UHID_IMMED	0x02	/* return read data immediately */
 	int sc_refcnt;
 	int sc_raw;
 	u_char sc_dying;
 };
 #define	UHIDUNIT(dev)	(minor(dev))
 #define	UHID_CHUNK	128	/* chunk size for read */
 #define	UHID_BSIZE	1020	/* buffer size */
 dev_type_open(uhidopen);
 dev_type_close(uhidclose);
 dev_type_read(uhidread);
 dev_type_write(uhidwrite);
 dev_type_ioctl(uhidioctl);
 dev_type_poll(uhidpoll);
 @@ -174,26 +175,28 @@ uhid_attach(device_t parent, device_t se
 	sc->sc_hdev.sc_dev = self;
 	selinit(&sc->sc_rsel);
 	sc->sc_hdev.sc_intr = uhid_intr;
 	sc->sc_hdev.sc_parent = uha->parent;
 	sc->sc_hdev.sc_report_id = uha->reportid;
 	sc->sc_sih = softint_establish(SOFTINT_CLOCK, uhid_softintr, sc);
 	uhidev_get_report_desc(uha->parent, &desc, &size);
 	repid = uha->reportid;
 	sc->sc_isize = hid_report_size(desc, size, hid_input,   repid);
 	sc->sc_osize = hid_report_size(desc, size, hid_output,  repid);
 	sc->sc_fsize = hid_report_size(desc, size, hid_feature, repid);
 	sc->sc_raw =  hid_is_collection(desc, size, uha->reportid,
 	    HID_USAGE2(HUP_FIDO, HUF_U2FHID));
 	aprint_naive("\n");
 	aprint_normal(": input=%d, output=%d, feature=%d\n",
 	       sc->sc_isize, sc->sc_osize, sc->sc_fsize);
 	mutex_init(&sc->sc_access_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	cv_init(&sc->sc_cv, "uhidrea");
 	cv_init(&sc->sc_detach_cv, "uhiddet");
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 @@ -472,35 +475,52 @@ uhidread(dev_t dev, struct uio *uio, int
 int
 uhid_do_write(struct uhid_softc *sc, struct uio *uio, int flag)
+{
 	int error;
 	int size;
 	usbd_status err;
 	DPRINTFN(1, ("uhidwrite\n"));
 	if (sc->sc_dying)
 		return EIO;
 	size = sc->sc_osize;
 	error = 0;
 	if (uio->uio_resid != size || size == 0)
 		return EINVAL;
 	error = uiomove(sc->sc_obuf, size, uio);
 #ifdef UHID_DEBUG
 	if (uhiddebug > 5) {
 		uint32_t i;
 		DPRINTF(("%s: outdata[%d] =", device_xname(sc->sc_hdev.sc_dev),
 		    error));
 		for (i = 0; i < size; i++)
 			DPRINTF((" %02x", sc->sc_obuf[i]));
 		DPRINTF(("\n"));
+	}
 #endif
 	if (!error) {
-		err = uhidev_set_report(&sc->sc_hdev, UHID_OUTPUT_REPORT,
+		if (sc->sc_raw)
-					sc->sc_obuf, size);
+			err = uhidev_write(sc->sc_hdev.sc_parent, sc->sc_obuf,
-		if (err)
+			    size);
 		else
 			err = uhidev_set_report(&sc->sc_hdev,
 			    UHID_OUTPUT_REPORT, sc->sc_obuf, size);
 		if (err) {
 			DPRINTF(("%s: err = %d\n",
 			    device_xname(sc->sc_hdev.sc_dev), err));
 			error = EIO;
+		}
+	}
 	return error;
+}
 int
 uhidwrite(dev_t dev, struct uio *uio, int flag)
+{
 	struct uhid_softc *sc;
 	int error;
 	sc = device_lookup_private(&uhid_cd, UHIDUNIT(dev));
 @@ -572,26 +592,34 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
 		mutex_enter(proc_lock);
 		if (sc->sc_async == NULL) {
 			mutex_exit(proc_lock);
 			return EINVAL;
+		}
 		if (-*(int *)addr != sc->sc_async->p_pgid
 		    && *(int *)addr != sc->sc_async->p_pid) {
 			mutex_exit(proc_lock);
 			return EPERM;
+		}
 		mutex_exit(proc_lock);
 		break;
 	case USB_HID_GET_RAW:
 		*(int *)addr = sc->sc_raw;
 		break;
 	case USB_HID_SET_RAW:
 		sc->sc_raw = *(int *)addr;
 		break;
 	case USB_GET_REPORT_DESC:
 		uhidev_get_report_desc(sc->sc_hdev.sc_parent, &desc, &size);
 		rd = (struct usb_ctl_report_desc *)addr;
 		size = uimin(size, sizeof(rd->ucrd_data));
 		rd->ucrd_size = size;
 		memcpy(rd->ucrd_data, desc, size);
 		break;
 	case USB_SET_IMMED:
 		if (*(int *)addr) {
 			extra = sc->sc_hdev.sc_report_id != 0;
 			if (sc->sc_isize + extra > sizeof(buffer))
 				return ENOBUFS;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbhid.h,v 1.18 2018/07/15 18:36:51 maya Exp $	*/
+/*	$NetBSD: usbhid.h,v 1.18.6.1 2020/07/15 14:09:04 martin Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbhid.h,v 1.7 1999/11/17 22:33:51 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:
 @@ -26,26 +26,27 @@
  * 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.
  */
 #ifndef _DEV_USB_USBHID_H_
 #define _DEV_USB_USBHID_H_
 #include <dev/hid/hid.h>
 #include <sys/ioccom.h>
 #define UR_GET_HID_DESCRIPTOR	0x06
 #define  UDESC_HID		0x21
 #define  UDESC_REPORT		0x22
 #define  UDESC_PHYSICAL		0x23
 #define UR_SET_HID_DESCRIPTOR	0x07
 #define UR_GET_REPORT		0x01
 #define UR_SET_REPORT		0x09
 #define UR_GET_IDLE		0x02
 #define UR_SET_IDLE		0x0a
 #define UR_GET_PROTOCOL		0x03
 #define UR_SET_PROTOCOL		0x0b
 @@ -56,14 +57,17 @@ typedef struct usb_hid_descriptor {
 	uByte		bCountryCode;
 	uByte		bNumDescriptors;
 	struct {
 		uByte		bDescriptorType;
 		uWord		wDescriptorLength;
 	} descrs[1];
 } UPACKED usb_hid_descriptor_t;
 #define USB_HID_DESCRIPTOR_SIZE(n) (9+(n)*3)
 #define UHID_INPUT_REPORT 0x01
 #define UHID_OUTPUT_REPORT 0x02
 #define UHID_FEATURE_REPORT 0x03
 #define USB_HID_GET_RAW	_IOR('h', 1, int)
 #define USB_HID_SET_RAW	_IOW('h', 2, int)
 #endif /* _DEV_USB_USBHID_H_ */