 @@ -1,14 +1,14 @@
-/*	$NetBSD: uftdi.c,v 1.76 2021/08/07 16:19:17 thorpej Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,43 +20,44 @@
  * ``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: uftdi.c,v 1.76 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.76.6.1 2024/04/16 18:45:39 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/ucomvar.h>
 #include <dev/usb/uftdireg.h>
 #ifdef UFTDI_DEBUG
 #define DPRINTF(x)	if (uftdidebug) printf x
 #define DPRINTFN(n,x)	if (uftdidebug>(n)) printf x
 int uftdidebug = 0;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 @@ -174,39 +175,105 @@ static const struct usb_devno uftdi_devs
 	{ USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK },
 	{ USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK_DUO },
 };
 #define uftdi_lookup(v, p) usb_lookup(uftdi_devs, v, p)
 static int	uftdi_match(device_t, cfdata_t, void *);
 static void	uftdi_attach(device_t, device_t, void *);
 static void	uftdi_childdet(device_t, device_t);
 static int	uftdi_detach(device_t, int);
 CFATTACH_DECL2_NEW(uftdi, sizeof(struct uftdi_softc), uftdi_match,
     uftdi_attach, uftdi_detach, NULL, NULL, uftdi_childdet);
 struct uftdi_match_quirk_entry {
 	uint16_t	vendor_id;
 	uint16_t	product_id;
 	int		iface_no;
 	const char *	vendor_str;
 	const char *	product_str;
 	int		match_ret;
 };
 static const struct uftdi_match_quirk_entry uftdi_match_quirks[] = {
 	/*
 	 * The Tigard board (https://github.com/tigard-tools/tigard)
 	 * has two interfaces, one of which is meant to act as a
 	 * regular USB serial port (interface 0), the other of which
 	 * is meant for other protocols (SWD, JTAG, etc.).  We must
 	 * reject interface 1 so that ugenif matches, thus allowing
 	 * full user-space control of that port.
 	 */
+	{
 	  .vendor_id	= USB_VENDOR_FTDI,
 	  .product_id	= USB_PRODUCT_FTDI_SERIAL_2232C,
 	  .iface_no	= 1,
 	  .vendor_str	= "SecuringHardware.com",
 	  .product_str	= "Tigard V1.1",
 	  .match_ret	= UMATCH_NONE,
+	}
 };
 static int
 uftdi_quirk_match(struct usbif_attach_arg *uiaa, int rv)
+{
 	struct usbd_device *dev = uiaa->uiaa_device;
 	const struct uftdi_match_quirk_entry *q;
 	int i;
 	for (i = 0; i < __arraycount(uftdi_match_quirks); i++) {
 		q = &uftdi_match_quirks[i];
 		if (uiaa->uiaa_vendor != q->vendor_id ||
 		    uiaa->uiaa_product != q->product_id ||
 		    uiaa->uiaa_ifaceno != q->iface_no) {
 			continue;
+		}
 		if (q->vendor_str != NULL &&
 		    (dev->ud_vendor == NULL ||
 		     strcmp(dev->ud_vendor, q->vendor_str) != 0)) {
 			continue;
+		}
 		if (q->product_str != NULL &&
 		    (dev->ud_product == NULL ||
 		     strcmp(dev->ud_product, q->product_str) != 0)) {
 			continue;
+		}
 		/*
 		 * Got a match!
 		 */
 		rv = q->match_ret;
 		break;
+	}
 	return rv;
+}
 static int
 uftdi_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usbif_attach_arg *uiaa = aux;
 	int rv;
 	DPRINTFN(20,("uftdi: vendor=%#x, product=%#x\n",
 		     uiaa->uiaa_vendor, uiaa->uiaa_product));
 	if (uiaa->uiaa_configno != UFTDI_CONFIG_NO)
 		return UMATCH_NONE;
-	return uftdi_lookup(uiaa->uiaa_vendor, uiaa->uiaa_product) != NULL ?
+	rv = uftdi_lookup(uiaa->uiaa_vendor, uiaa->uiaa_product) != NULL ?
 		UMATCH_VENDOR_PRODUCT_CONF_IFACE : UMATCH_NONE;
 	if (rv != UMATCH_NONE) {
 		rv = uftdi_quirk_match(uiaa, rv);
+	}
 	return rv;
+}
 static void
 uftdi_attach(device_t parent, device_t self, void *aux)
+{
 	struct uftdi_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = aux;
 	struct usbd_device *dev = uiaa->uiaa_device;
 	struct usbd_interface *iface = uiaa->uiaa_iface;
 	usb_device_descriptor_t *ddesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ugen.c,v 1.171 2022/10/23 11:06:37 riastradh Exp $	*/
+/*	$NetBSD: ugen.c,v 1.171.2.1 2024/04/16 18:45:39 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2004 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.
+ *
  * Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
  * Effort sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and the Department of the Interior National Business
  * Center under agreement number NBCHC050166.
 @@ -27,27 +27,27 @@
  * 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: ugen.c,v 1.171 2022/10/23 11:06:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.171.2.1 2024/04/16 18:45:39 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/device.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 @@ -348,28 +348,32 @@ ugen_match(device_t parent, cfdata_t mat
 		override = match->cf_flags & 1;
 	if (override)
 		return UMATCH_HIGHEST;
 	else if (uaa->uaa_usegeneric)
 		return UMATCH_GENERIC;
 	else
 		return UMATCH_NONE;
+}
 static int
 ugenif_match(device_t parent, cfdata_t match, void *aux)
+{
-	/* Assume that they knew what they configured! (see ugenif(4)) */
+	/*
-	return UMATCH_HIGHEST;
+	 * Like ugen(4), ugenif(4) also has an override flag.  It has the
 	 * opposite effect, however, causing us to match with GENERIC
 	 * priority rather than HIGHEST.
 	 */
 	return (match->cf_flags & 1) ? UMATCH_GENERIC : UMATCH_HIGHEST;
+}
 static void
 ugen_attach(device_t parent, device_t self, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	struct usbif_attach_arg uiaa;
 	memset(&uiaa, 0, sizeof(uiaa));
 	uiaa.uiaa_port = uaa->uaa_port;
 	uiaa.uiaa_vendor = uaa->uaa_vendor;
 	uiaa.uiaa_product = uaa->uaa_product;
 	uiaa.uiaa_release = uaa->uaa_release;

 @@ -1,14 +1,14 @@
-#	$NetBSD: usbdevices.config,v 1.42 2021/06/29 10:22:37 nia Exp $
+#	$NetBSD: usbdevices.config,v 1.42.10.1 2024/04/16 18:45:39 martin Exp $
+#
 # This file contains all USB related configuration.
 # It is suitable for inclusion in a kernel config(5) file.
+#
 # USB Controller and Devices
 # PCI USB controllers
 #ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
 #ohci*	at pci?	dev ? function ?	# Open Host Controller
 #uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)
 # CardBus USB controllers
 @@ -249,13 +249,20 @@ aubtfwl* at uhub? port ?	# load Atheros
 bthub* at ubt?
 # Araneus Alea I/II TRNG
 ualea* at uhub? port ? configuration ? interface ?
 # Yubikey -- CCID interface (OTP and FIDO are handled by uhidev(4))
 # https://support.yubico.com/support/solutions/articles/15000028104-yubikey-usb-id-values
 ugenif* at uhub? vendor 0x1050 product 0x0114 configuration 1 interface 1
 ugenif* at uhub? vendor 0x1050 product 0x0115 configuration 1 interface 1
 ugenif* at uhub? vendor 0x1050 product 0x0116 configuration 1 interface 2
 ugenif* at uhub? vendor 0x1050 product 0x0405 configuration 1 interface 1
 ugenif* at uhub? vendor 0x1050 product 0x0406 configuration 1 interface 1
 ugenif* at uhub? vendor 0x1050 product 0x0407 configuration 1 interface 2
 # Tigard debug board (FT2232C-based).  This line is used in conjunction
 # with a match quirk in uftdi.c.  The "flags 1" is important; normally
 # ugenif matches with higest priority, but we don't want that for all
 # FT2232C interfaces, only interfaces that go unclaimed by uftdi (which
 # is what the match quirk ensures).
 ugenif* at uhub? vendor 0x0403 product 0x6010 configuration 1 interface 1 flags 1

 @@ -1,14 +1,14 @@
-.\" $NetBSD: ugen.4,v 1.38 2020/08/28 16:07:49 fcambus Exp $
+.\" $NetBSD: ugen.4,v 1.38.6.1 2024/04/16 18:45:39 martin Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Lennart Augustsson.
 .\"
 .\" 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
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -17,73 +17,82 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``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.
 .\"
-.Dd September 14, 2019
+.Dd March 25, 2024
 .Dt UGEN 4
 .Os
 .Sh NAME
 .Nm ugen
 .Nd USB generic device support
 .Sh SYNOPSIS
 .Cd "ugen* at uhub? flags N"
 .Cd "ugen* at uhub? vendor V product P flags 1"
 .Cd "ugenif* at uhub? vendor V product P configuration C interface I"
 .Cd "ugenif* at uhub? vendor V product P configuration C interface I flags 1"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for all USB devices that do not have
 a special driver.
 It supports access to all parts of the device,
 but not in a way that is as convenient as a special purpose driver.
 .Pp
 Normally the
 .Nm
 driver is used when no other driver attaches to a device.
 If
 .Dq flags 1
 is specified, the
 .Nm
 will instead attach with a very high priority and always be used.
 Together with the
 .Cd vendor
 and
 .Cd product
 locators this can be used to force the
 .Nm
 driver to be used for a certain
 device.
 .Pp
-The second form of attachment can be used to
+The
 .Sq ugenif
 form of attachment can be used to
 .Dq steal
 only one interface from some device for use by the
 .Nm
 driver.
 Most likely you want to explicitly specify at least vendor,
 product and interface with this form,
 as otherwise the
 .Nm
 driver would capture all of your
 .Nm usb
 devices.
 If
 .Dq flags 1
 is specified, the
 .Sq ugenif
 form will match at the lowest priority, thus allowing it to match only
 otherwise unclaimed interfaces.
 .Em NOTE :
 You have to be extremely careful,
 when using this form,
 as the attached
 .Nm
 driver has access to all of the device
 and can easily interfere with the driver(s) used for
 the other interface(s).
 .Pp
 As an example of this second form of attachment there are
 various debugging boards available based on some FTDI chip,
 where one interface is used for JTAG debugging
 and the other is used as a serial interface.