Module Name: src
Committed By: jakllsch
Date: Mon Apr 9 16:21:11 UTC 2018
Modified Files:
src/sys/arch/arm/at91: at91ohci.c
src/sys/arch/arm/broadcom: bcm53xx_usb.c
src/sys/arch/arm/ep93xx: epohci.c
src/sys/arch/arm/gemini: obio_ehci.c
src/sys/arch/arm/imx: imxusb.c
src/sys/arch/arm/nvidia: tegra_ehci.c
src/sys/arch/arm/omap: obio_ohci.c omap3_ehci.c omapl1x_ohci.c
src/sys/arch/arm/s3c2xx0: ohci_s3c24x0.c
src/sys/arch/arm/samsung: exynos_ehci.c
src/sys/arch/arm/sunxi: sunxi_musb.c
src/sys/arch/arm/xscale: pxa2x0_ohci.c
src/sys/arch/arm/zynq: zynq_usb.c
src/sys/arch/i386/pci: gcscehci.c
src/sys/arch/mips/adm5120/dev: ahci.c
src/sys/arch/mips/cavium/dev: octeon_usbcvar.h
src/sys/arch/mips/ingenic: ingenic_ehci.c ingenic_ohci.c
src/sys/arch/mips/ralink: ralink_ehci.c ralink_ohci.c
src/sys/dev/cardbus: ehci_cardbus.c ohci_cardbus.c uhci_cardbus.c
src/sys/dev/fdt: ehci_fdt.c ohci_fdt.c
src/sys/dev/ic: sl811hs.c
src/sys/dev/marvell: ehci_mv.c
src/sys/dev/pci: ehci_pci.c ohci_pci.c uhci_pci.c xhci_pci.c
src/sys/dev/usb: ehci.c ehcivar.h motg.c motgvar.h ohci.c ohcivar.h
uhci.c uhcivar.h xhci.c xhcivar.h
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Stop potential misuse of vendor names and USB vendor IDs in root hub
device and string descriptors.
Firstly: Few vendors have identical PCI-SIG vendor IDs and USB-IF vendor
IDs. As such, using the PCI vendor ID as a USB vendor ID may trample
on whomever is allocated that USB vendor ID.
Secondly: The vendor of the host controller hardware implementation has
little to nothing to do with our usbroothub implementation. Thus we
should not potentially associate any problems therewith to such third
party.
This change will result in root hubs being identified by USB Vendor ID
0x0000. Root hub vendor string will now be "NetBSD" (or, specifically:
ostype). Product ID (0x0000) and product strings remain unchanged.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/at91/at91ohci.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcm53xx_usb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ep93xx/epohci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/obio_ehci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/nvidia/tegra_ehci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/obio_ohci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/omap/omap3_ehci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omapl1x_ohci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_musb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_ohci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/zynq/zynq_usb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/dev/octeon_usbcvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/ingenic/ingenic_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ingenic/ingenic_ohci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/ralink/ralink_ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/ralink/ralink_ohci.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/ehci_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/ohci_fdt.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/ehci_mv.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/uhci_pci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/xhci_pci.c
cvs rdiff -u -r1.257 -r1.258 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/motgvar.h
cvs rdiff -u -r1.279 -r1.280 src/sys/dev/usb/ohci.c src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/usb/ohcivar.h
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/xhcivar.h
cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/dwc2/dwc2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/at91/at91ohci.c
diff -u src/sys/arch/arm/at91/at91ohci.c:1.6 src/sys/arch/arm/at91/at91ohci.c:1.7
--- src/sys/arch/arm/at91/at91ohci.c:1.6 Sat Apr 23 10:15:27 2016
+++ src/sys/arch/arm/at91/at91ohci.c Mon Apr 9 16:21:09 2018
@@ -1,5 +1,5 @@
-/* $Id: at91ohci.c,v 1.6 2016/04/23 10:15:27 skrll Exp $ */
-/* $NetBSD: at91ohci.c,v 1.6 2016/04/23 10:15:27 skrll Exp $ */
+/* $Id: at91ohci.c,v 1.7 2018/04/09 16:21:09 jakllsch Exp $ */
+/* $NetBSD: at91ohci.c,v 1.7 2018/04/09 16:21:09 jakllsch Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.6 2016/04/23 10:15:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.7 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,8 +126,6 @@ at91ohci_callback(device_t self)
bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_INTERRUPT_DISABLE,
OHCI_ALL_INTRS);
- strlcpy(sc->sc.sc_vendor, "Atmel", sizeof sc->sc.sc_vendor);
-
sc->sc_ih = at91_intr_establish(sc->sc_pid, IPL_USB, INTR_HIGH_LEVEL, ohci_intr, sc);
int err = ohci_init(&sc->sc);
Index: src/sys/arch/arm/broadcom/bcm53xx_usb.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.7 src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.8
--- src/sys/arch/arm/broadcom/bcm53xx_usb.c:1.7 Sat Apr 23 10:15:27 2016
+++ src/sys/arch/arm/broadcom/bcm53xx_usb.c Mon Apr 9 16:21:09 2018
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.7 2016/04/23 10:15:27 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.8 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -54,8 +54,6 @@ __KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.
#include <dev/usb/ehcireg.h>
#include <dev/usb/ehcivar.h>
-#include <dev/pci/pcidevs.h>
-
struct bcmusb_softc {
device_t usbsc_dev;
bus_dma_tag_t usbsc_dmat;
@@ -116,9 +114,6 @@ ohci_bcmusb_attach(device_t parent, devi
sc->sc_bus.ub_dmatag = usbaa->usbaa_dmat;
sc->sc_bus.ub_hcpriv = sc;
- sc->sc_id_vendor = PCI_VENDOR_BROADCOM;
- strlcpy(sc->sc_vendor, "Broadcom", sizeof(sc->sc_vendor));
-
aprint_naive(": OHCI USB controller\n");
aprint_normal(": OHCI USB controller\n");
@@ -176,9 +171,6 @@ ehci_bcmusb_attach(device_t parent, devi
sc->sc_comps[sc->sc_ncomp++] = usbsc->usbsc_ohci_dev;
}
- sc->sc_id_vendor = PCI_VENDOR_BROADCOM;
- strlcpy(sc->sc_vendor, "Broadcom", sizeof(sc->sc_vendor));
-
aprint_naive(": EHCI USB controller\n");
aprint_normal(": ECHI USB controller\n");
Index: src/sys/arch/arm/ep93xx/epohci.c
diff -u src/sys/arch/arm/ep93xx/epohci.c:1.8 src/sys/arch/arm/ep93xx/epohci.c:1.9
--- src/sys/arch/arm/ep93xx/epohci.c:1.8 Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/ep93xx/epohci.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: epohci.c,v 1.8 2016/04/23 10:15:28 skrll Exp $ */
+/* $NetBSD: epohci.c,v 1.9 2018/04/09 16:21:09 jakllsch Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.8 2016/04/23 10:15:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.9 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -140,8 +140,6 @@ epohci_callback(device_t self)
bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_INTERRUPT_DISABLE,
OHCI_ALL_INTRS);
- strlcpy(sc->sc.sc_vendor, "Cirrus Logic", sizeof sc->sc.sc_vendor);
-
sc->sc_ih = ep93xx_intr_establish(sc->sc_intr, IPL_USB,
ohci_intr, sc);
int err = ohci_init(&sc->sc);
Index: src/sys/arch/arm/gemini/obio_ehci.c
diff -u src/sys/arch/arm/gemini/obio_ehci.c:1.4 src/sys/arch/arm/gemini/obio_ehci.c:1.5
--- src/sys/arch/arm/gemini/obio_ehci.c:1.4 Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/gemini/obio_ehci.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_ehci.c,v 1.4 2016/04/23 10:15:28 skrll Exp $ */
+/* $NetBSD: obio_ehci.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_ehci.c,v 1.4 2016/04/23 10:15:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ehci.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $");
#include "locators.h"
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: obio_ehci.c,
#include <arm/gemini/gemini_reg.h>
#include <arm/gemini/gemini_obiovar.h>
-#include <dev/pci/pcidevs.h>
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
@@ -132,10 +130,6 @@ ehci_obio_attach(device_t parent, device
sc->sc_bus.ub_revision = USBREV_2_0;
- /* Figure out vendor for root hub descriptor. */
- sc->sc_id_vendor = PCI_VENDOR_FARADAY;
- strlcpy(sc->sc_vendor, "SL351x", sizeof(sc->sc_vendor));
-
int err = ehci_init(sc);
if (err) {
aprint_error("%s: init failed, error=%d\n", devname, err);
Index: src/sys/arch/arm/imx/imxusb.c
diff -u src/sys/arch/arm/imx/imxusb.c:1.12 src/sys/arch/arm/imx/imxusb.c:1.13
--- src/sys/arch/arm/imx/imxusb.c:1.12 Tue May 17 06:44:46 2016
+++ src/sys/arch/arm/imx/imxusb.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imxusb.c,v 1.12 2016/05/17 06:44:46 ryo Exp $ */
+/* $NetBSD: imxusb.c,v 1.13 2018/04/09 16:21:09 jakllsch Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi and Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.12 2016/05/17 06:44:46 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.13 2018/04/09 16:21:09 jakllsch Exp $");
#include "opt_imx.h"
@@ -202,9 +202,6 @@ imxehci_attach(device_t parent, device_t
intr_establish(aa->aa_irq, IPL_USB, IST_LEVEL, ehci_intr, hsc);
- /* Figure out vendor for root hub descriptor. */
- strlcpy(hsc->sc_vendor, "i.MX", sizeof(hsc->sc_vendor));
-
int err = ehci_init(hsc);
if (err) {
aprint_error_dev(self, "init failed, error=%d\n", err);
Index: src/sys/arch/arm/nvidia/tegra_ehci.c
diff -u src/sys/arch/arm/nvidia/tegra_ehci.c:1.15 src/sys/arch/arm/nvidia/tegra_ehci.c:1.16
--- src/sys/arch/arm/nvidia/tegra_ehci.c:1.15 Thu May 25 23:45:04 2017
+++ src/sys/arch/arm/nvidia/tegra_ehci.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_ehci.c,v 1.15 2017/05/25 23:45:04 jmcneill Exp $ */
+/* $NetBSD: tegra_ehci.c,v 1.16 2018/04/09 16:21:09 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_ehci.c,v 1.15 2017/05/25 23:45:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_ehci.c,v 1.16 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -112,8 +112,6 @@ tegra_ehci_attach(device_t parent, devic
sc->sc.sc_bus.ub_revision = USBREV_2_0;
sc->sc.sc_ncomp = 0;
sc->sc.sc_flags = EHCIF_ETTF;
- sc->sc.sc_id_vendor = 0x10de;
- strlcpy(sc->sc.sc_vendor, "Tegra", sizeof(sc->sc.sc_vendor));
sc->sc.sc_size = size - TEGRA_EHCI_REG_OFFSET;
sc->sc.iot = sc->sc_bst;
bus_space_subregion(sc->sc_bst, sc->sc_bsh, TEGRA_EHCI_REG_OFFSET,
Index: src/sys/arch/arm/omap/obio_ohci.c
diff -u src/sys/arch/arm/omap/obio_ohci.c:1.11 src/sys/arch/arm/omap/obio_ohci.c:1.12
--- src/sys/arch/arm/omap/obio_ohci.c:1.11 Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/omap/obio_ohci.c Mon Apr 9 16:21:09 2018
@@ -1,7 +1,7 @@
-/* $Id: obio_ohci.c,v 1.11 2016/04/23 10:15:28 skrll Exp $ */
+/* $Id: obio_ohci.c,v 1.12 2018/04/09 16:21:09 jakllsch Exp $ */
/* adapted from: */
-/* $NetBSD: obio_ohci.c,v 1.11 2016/04/23 10:15:28 skrll Exp $ */
+/* $NetBSD: obio_ohci.c,v 1.12 2018/04/09 16:21:09 jakllsch Exp $ */
/* $OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */
/*
@@ -24,7 +24,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.11 2016/04/23 10:15:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.12 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,7 +148,6 @@ obioohci_attach(device_t parent, device_
goto free_map;
}
- strlcpy(sc->sc.sc_vendor, "OMAP", sizeof(sc->sc.sc_vendor));
int err = ohci_init(&sc->sc);
if (err) {
aprint_error_dev(self, "init failed, error=%d\n", err);
Index: src/sys/arch/arm/omap/omap3_ehci.c
diff -u src/sys/arch/arm/omap/omap3_ehci.c:1.12 src/sys/arch/arm/omap/omap3_ehci.c:1.13
--- src/sys/arch/arm/omap/omap3_ehci.c:1.12 Tue Oct 4 15:59:36 2016
+++ src/sys/arch/arm/omap/omap3_ehci.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_ehci.c,v 1.12 2016/10/04 15:59:36 kiyohara Exp $ */
+/* $NetBSD: omap3_ehci.c,v 1.13 2018/04/09 16:21:09 jakllsch Exp $ */
/*-
* Copyright (c) 2010-2012 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.12 2016/10/04 15:59:36 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.13 2018/04/09 16:21:09 jakllsch Exp $");
#include "locators.h"
@@ -41,8 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c
#include <machine/intr.h>
-#include <dev/pci/pcidevs.h>
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
@@ -479,8 +477,6 @@ omap3_ehci_attach(device_t parent, devic
sc->sc_uhh_size = UHH_SIZE;
sc->sc.sc_bus.ub_dmatag = obio->obio_dmat;
sc->sc.sc_bus.ub_revision = USBREV_2_0;
- sc->sc.sc_id_vendor = PCI_VENDOR_TI;
- strlcpy(sc->sc.sc_vendor, "OMAP3", sizeof(sc->sc.sc_vendor));
#ifdef OMAP_3XXX
omap3_dpll5_init(sc);
Index: src/sys/arch/arm/omap/omapl1x_ohci.c
diff -u src/sys/arch/arm/omap/omapl1x_ohci.c:1.2 src/sys/arch/arm/omap/omapl1x_ohci.c:1.3
--- src/sys/arch/arm/omap/omapl1x_ohci.c:1.2 Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/omap/omapl1x_ohci.c Mon Apr 9 16:21:09 2018
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_ohci.c,v 1.2 2016/04/23 10:15:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_ohci.c,v 1.3 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,8 +147,6 @@ omapl1xohci_attach (struct device *paren
return;
}
- strlcpy(sc->sc.sc_vendor, "OMAPL1X", sizeof sc->sc.sc_vendor);
-
int err = ohci_init(&sc->sc);
if (err) {
aprint_error_dev(self, "init failed, error=%d\n", err);
Index: src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
diff -u src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.9 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.10
--- src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.9 Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_s3c24x0.c,v 1.9 2016/04/23 10:15:28 skrll Exp $ */
+/* $NetBSD: ohci_s3c24x0.c,v 1.10 2018/04/09 16:21:09 jakllsch Exp $ */
/* derived from ohci_pci.c */
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.9 2016/04/23 10:15:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.10 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,8 +120,6 @@ ohci_ssio_attach(device_t parent, device
return;
}
- strlcpy(sc->sc.sc_vendor, "Samsung", sizeof sc->sc.sc_vendor);
-
int err = ohci_init(&sc->sc);
if (err) {
aprint_error_dev(self, "init failed, error=%d\n", err);
Index: src/sys/arch/arm/samsung/exynos_ehci.c
diff -u src/sys/arch/arm/samsung/exynos_ehci.c:1.2 src/sys/arch/arm/samsung/exynos_ehci.c:1.3
--- src/sys/arch/arm/samsung/exynos_ehci.c:1.2 Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/samsung/exynos_ehci.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ehci.c,v 1.2 2016/04/23 10:15:28 skrll Exp $ */
+/* $NetBSD: exynos_ehci.c,v 1.3 2018/04/09 16:21:09 jakllsch Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_ehci.c,v 1.2 2016/04/23 10:15:28 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_ehci.c,v 1.3 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,6 @@ exynos_ehci_attach(device_t parent, devi
sc->sc_bus.ub_hcpriv = sc;
sc->sc_bus.ub_revision = USBREV_2_0;
sc->sc_ncomp = 0;
- strlcpy(sc->sc_vendor, "exynos", sizeof(sc->sc_vendor));
error = bus_space_map(sc->iot, addr, size, 0, &sc->ioh);
if (error) {
Index: src/sys/arch/arm/sunxi/sunxi_musb.c
diff -u src/sys/arch/arm/sunxi/sunxi_musb.c:1.4 src/sys/arch/arm/sunxi/sunxi_musb.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_musb.c:1.4 Sun Apr 8 13:36:37 2018
+++ src/sys/arch/arm/sunxi/sunxi_musb.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_musb.c,v 1.4 2018/04/08 13:36:37 jmcneill Exp $ */
+/* $NetBSD: sunxi_musb.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.4 2018/04/08 13:36:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -361,7 +361,6 @@ sunxi_musb_attach(device_t parent, devic
sc->sc_dev = self;
sc->sc_bus.ub_hcpriv = sc;
sc->sc_bus.ub_dmatag = faa->faa_dmat;
- strlcpy(sc->sc_vendor, "Allwinner", sizeof(sc->sc_vendor));
sc->sc_size = size;
sc->sc_iot = &msc->sc_bs;
if (bus_space_map(faa->faa_bst, addr, size, 0, &sc->sc_ioh) != 0) {
Index: src/sys/arch/arm/xscale/pxa2x0_ohci.c
diff -u src/sys/arch/arm/xscale/pxa2x0_ohci.c:1.10 src/sys/arch/arm/xscale/pxa2x0_ohci.c:1.11
--- src/sys/arch/arm/xscale/pxa2x0_ohci.c:1.10 Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/xscale/pxa2x0_ohci.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_ohci.c,v 1.10 2016/04/23 10:15:28 skrll Exp $ */
+/* $NetBSD: pxa2x0_ohci.c,v 1.11 2018/04/09 16:21:09 jakllsch Exp $ */
/* $OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */
/*
@@ -116,7 +116,6 @@ pxaohci_attach(device_t parent, device_t
goto free_map;
}
- strlcpy(sc->sc.sc_vendor, "PXA27x", sizeof(sc->sc.sc_vendor));
int err = ohci_init(&sc->sc);
if (err) {
aprint_error_dev(sc->sc.sc_dev, "init failed, error=%d\n", err);
Index: src/sys/arch/arm/zynq/zynq_usb.c
diff -u src/sys/arch/arm/zynq/zynq_usb.c:1.4 src/sys/arch/arm/zynq/zynq_usb.c:1.5
--- src/sys/arch/arm/zynq/zynq_usb.c:1.4 Sat Apr 23 10:15:29 2016
+++ src/sys/arch/arm/zynq/zynq_usb.c Mon Apr 9 16:21:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_usb.c,v 1.4 2016/04/23 10:15:29 skrll Exp $ */
+/* $NetBSD: zynq_usb.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_usb.c,v 1.4 2016/04/23 10:15:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_usb.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $");
#include "opt_zynq.h"
@@ -177,9 +177,6 @@ zynqusb_attach_common(device_t parent, d
intr_establish(intr, IPL_USB, IST_LEVEL, ehci_intr, hsc);
- /* Figure out vendor for root hub descriptor. */
- strlcpy(hsc->sc_vendor, "Xilinx", sizeof(hsc->sc_vendor));
-
int err = ehci_init(hsc);
if (err) {
aprint_error_dev(self, "init failed, error = %d\n", err);
Index: src/sys/arch/i386/pci/gcscehci.c
diff -u src/sys/arch/i386/pci/gcscehci.c:1.12 src/sys/arch/i386/pci/gcscehci.c:1.13
--- src/sys/arch/i386/pci/gcscehci.c:1.12 Sat Apr 23 10:15:29 2016
+++ src/sys/arch/i386/pci/gcscehci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscehci.c,v 1.12 2016/04/23 10:15:29 skrll Exp $ */
+/* $NetBSD: gcscehci.c,v 1.13 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.12 2016/04/23 10:15:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.13 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,11 +148,6 @@ gcscehci_attach(device_t parent, device_
sc->sc.sc_bus.ub_revision = USBREV_2_0;
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = PCI_VENDOR(pa->pa_id);
- pci_findvendor(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
- sc->sc.sc_id_vendor);
-
/*
* Find companion controllers. According to the spec they always
* have lower function numbers so they should be enumerated already.
Index: src/sys/arch/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.14 src/sys/arch/mips/adm5120/dev/ahci.c:1.15
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.14 Thu Jun 1 02:45:06 2017
+++ src/sys/arch/mips/adm5120/dev/ahci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.14 2017/06/01 02:45:06 chs Exp $ */
+/* $NetBSD: ahci.c,v 1.15 2018/04/09 16:21:10 jakllsch Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.14 2017/06/01 02:45:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.15 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -539,27 +539,16 @@ ahci_roothub_ctrl(struct usbd_bus *bus,
switch (C(req->bRequest, req->bmRequestType)) {
case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
switch (value) {
- case C(0, UDESC_DEVICE): {
- usb_device_descriptor_t devd;
-
- DPRINTF(D_MSG, ("UDESC_DEVICE "));
- totlen = min(buflen, sizeof(devd));
- memcpy(&devd, buf, totlen);
- USETW(devd.idVendor, USB_VENDOR_SCANLOGIC);
- memcpy(buf, &devd, totlen);
- break;
- }
#define sd ((usb_string_descriptor_t *)buf)
- case C(1, UDESC_STRING):
- /* Vendor */
- totlen = usb_makestrdesc(sd, len, "ADMTek");
- break;
case C(2, UDESC_STRING):
/* Product */
totlen = usb_makestrdesc(sd, len, "ADM5120 root hub");
break;
default:
printf("unknownGetDescriptor=%x", value);
+ /* FALLTHROUGH */
+ case C(0, UDESC_DEVICE):
+ case C(1, UDESC_STRING):
/* default from usbroothub */
return buflen;
}
Index: src/sys/arch/mips/cavium/dev/octeon_usbcvar.h
diff -u src/sys/arch/mips/cavium/dev/octeon_usbcvar.h:1.3 src/sys/arch/mips/cavium/dev/octeon_usbcvar.h:1.4
--- src/sys/arch/mips/cavium/dev/octeon_usbcvar.h:1.3 Tue Apr 26 09:23:33 2016
+++ src/sys/arch/mips/cavium/dev/octeon_usbcvar.h Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_usbcvar.h,v 1.3 2016/04/26 09:23:33 skrll Exp $ */
+/* $NetBSD: octeon_usbcvar.h,v 1.4 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -219,9 +219,6 @@ typedef struct octeon_usbc_softc {
SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
- char sc_vendor[16]; /* vendor string for root hub */
- int sc_id_vendor; /* vendor ID for root hub */
-
void *sc_ih;
#if defined(__NetBSD__)
device_t sc_child;
Index: src/sys/arch/mips/ingenic/ingenic_ehci.c
diff -u src/sys/arch/mips/ingenic/ingenic_ehci.c:1.5 src/sys/arch/mips/ingenic/ingenic_ehci.c:1.6
--- src/sys/arch/mips/ingenic/ingenic_ehci.c:1.5 Sat Apr 23 10:15:30 2016
+++ src/sys/arch/mips/ingenic/ingenic_ehci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_ehci.c,v 1.5 2016/04/23 10:15:30 skrll Exp $ */
+/* $NetBSD: ingenic_ehci.c,v 1.6 2018/04/09 16:21:10 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.5 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.6 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -201,8 +201,6 @@ ingenic_ehci_attach(device_t parent, dev
sc->sc_ncomp = 0;
sc->sc_npcomp = 0;
#endif
- sc->sc_id_vendor = USB_VENDOR_INGENIC;
- strlcpy(sc->sc_vendor, "Ingenic", sizeof(sc->sc_vendor));
error = ehci_init(sc);
if (error) {
Index: src/sys/arch/mips/ingenic/ingenic_ohci.c
diff -u src/sys/arch/mips/ingenic/ingenic_ohci.c:1.4 src/sys/arch/mips/ingenic/ingenic_ohci.c:1.5
--- src/sys/arch/mips/ingenic/ingenic_ohci.c:1.4 Sat Apr 23 10:15:30 2016
+++ src/sys/arch/mips/ingenic/ingenic_ohci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_ohci.c,v 1.4 2016/04/23 10:15:30 skrll Exp $ */
+/* $NetBSD: ingenic_ohci.c,v 1.5 2018/04/09 16:21:10 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_ohci.c,v 1.4 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_ohci.c,v 1.5 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,9 +113,6 @@ ingenic_ohci_attach(device_t parent, dev
sc->sc_endian = OHCI_LITTLE_ENDIAN;
- sc->sc_id_vendor = USB_VENDOR_INGENIC;
- strlcpy(sc->sc_vendor, "Ingenic", sizeof(sc->sc_vendor));
-
error = ohci_init(sc);
if (error) {
aprint_error_dev(self, "init failed, error=%d\n", error);
Index: src/sys/arch/mips/ralink/ralink_ehci.c
diff -u src/sys/arch/mips/ralink/ralink_ehci.c:1.6 src/sys/arch/mips/ralink/ralink_ehci.c:1.7
--- src/sys/arch/mips/ralink/ralink_ehci.c:1.6 Sat Apr 23 10:15:30 2016
+++ src/sys/arch/mips/ralink/ralink_ehci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_ehci.c,v 1.6 2016/04/23 10:15:30 skrll Exp $ */
+/* $NetBSD: ralink_ehci.c,v 1.7 2018/04/09 16:21:10 jakllsch Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_ehci.c -- Ralink EHCI USB Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.6 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.7 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -153,10 +153,6 @@ ralink_ehci_attach(device_t parent, devi
}
sc->sc_ehci.sc_ncomp = ncomp;
- /* set vendor for root hub descriptor. */
- sc->sc_ehci.sc_id_vendor = 0x1814; /* XXX */
- strlcpy(sc->sc_ehci.sc_vendor, "Ralink", sizeof(sc->sc_ehci.sc_vendor));
-
/* Initialize EHCI */
int err = ehci_init(&sc->sc_ehci);
if (err) {
Index: src/sys/arch/mips/ralink/ralink_ohci.c
diff -u src/sys/arch/mips/ralink/ralink_ohci.c:1.4 src/sys/arch/mips/ralink/ralink_ohci.c:1.5
--- src/sys/arch/mips/ralink/ralink_ohci.c:1.4 Sat Apr 23 10:15:30 2016
+++ src/sys/arch/mips/ralink/ralink_ohci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_ohci.c,v 1.4 2016/04/23 10:15:30 skrll Exp $ */
+/* $NetBSD: ralink_ohci.c,v 1.5 2018/04/09 16:21:10 jakllsch Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -31,7 +31,7 @@
#include "ehci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_ohci.c,v 1.4 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_ohci.c,v 1.5 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -132,10 +132,6 @@ ralink_ohci_attach(device_t parent, devi
goto fail_0;
}
- /* Set vendor for root hub descriptor. */
- sc->sc_ohci.sc_id_vendor = 0x1814;
- strlcpy(sc->sc_ohci.sc_vendor, "Ralink", sizeof(sc->sc_ohci.sc_vendor));
-
/* Initialize OHCI */
error = ohci_init(&sc->sc_ohci);
if (error) {
Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.34 src/sys/dev/cardbus/ehci_cardbus.c:1.35
--- src/sys/dev/cardbus/ehci_cardbus.c:1.34 Thu Jul 14 04:00:45 2016
+++ src/sys/dev/cardbus/ehci_cardbus.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.34 2016/07/14 04:00:45 msaitoh Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.35 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.34 2016/07/14 04:00:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.35 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -170,11 +170,6 @@ ehci_cardbus_attach(device_t parent, dev
return;
}
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = PCI_VENDOR(ca->ca_id);
- pci_findvendor(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
- sc->sc.sc_id_vendor);
-
/*
* Find companion controllers. According to the spec they always
* have lower function numbers so they should be enumerated already.
Index: src/sys/dev/cardbus/ohci_cardbus.c
diff -u src/sys/dev/cardbus/ohci_cardbus.c:1.43 src/sys/dev/cardbus/ohci_cardbus.c:1.44
--- src/sys/dev/cardbus/ohci_cardbus.c:1.43 Thu Jul 14 04:00:45 2016
+++ src/sys/dev/cardbus/ohci_cardbus.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.43 2016/07/14 04:00:45 msaitoh Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.44 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.43 2016/07/14 04:00:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.44 2018/04/09 16:21:10 jakllsch Exp $");
#include "ehci_cardbus.h"
@@ -146,11 +146,6 @@ ohci_cardbus_attach(device_t parent, dev
return;
}
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = PCI_VENDOR(ca->ca_id);
- pci_findvendor(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
- sc->sc.sc_id_vendor);
-
int err = ohci_init(&sc->sc);
if (err) {
aprint_error("%s: init failed, error=%d\n", devname, err);
Index: src/sys/dev/cardbus/uhci_cardbus.c
diff -u src/sys/dev/cardbus/uhci_cardbus.c:1.24 src/sys/dev/cardbus/uhci_cardbus.c:1.25
--- src/sys/dev/cardbus/uhci_cardbus.c:1.24 Thu Jul 14 04:00:45 2016
+++ src/sys/dev/cardbus/uhci_cardbus.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.24 2016/07/14 04:00:45 msaitoh Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.25 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 1998-2005 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.24 2016/07/14 04:00:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.25 2018/04/09 16:21:10 jakllsch Exp $");
#include "ehci_cardbus.h"
@@ -153,11 +153,6 @@ uhci_cardbus_attach(device_t parent, dev
break;
}
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = PCI_VENDOR(ca->ca_id);
- pci_findvendor(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
- sc->sc.sc_id_vendor);
-
int err = uhci_init(&sc->sc);
if (err) {
aprint_error("%s: init failed, error=%d\n", devname, err);
Index: src/sys/dev/fdt/ehci_fdt.c
diff -u src/sys/dev/fdt/ehci_fdt.c:1.2 src/sys/dev/fdt/ehci_fdt.c:1.3
--- src/sys/dev/fdt/ehci_fdt.c:1.2 Sat Jul 8 16:19:56 2017
+++ src/sys/dev/fdt/ehci_fdt.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_fdt.c,v 1.2 2017/07/08 16:19:56 jmcneill Exp $ */
+/* $NetBSD: ehci_fdt.c,v 1.3 2018/04/09 16:21:10 jakllsch Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.2 2017/07/08 16:19:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.3 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -113,8 +113,6 @@ ehci_fdt_attach(device_t parent, device_
sc->sc_flags |= EHCIF_ETTF;
else
sc->sc_ncomp = 1;
- sc->sc_id_vendor = 0;
- strlcpy(sc->sc_vendor, "Generic", sizeof(sc->sc_vendor));
sc->sc_size = size;
sc->iot = faa->faa_bst;
if (bus_space_map(sc->iot, addr, size, 0, &sc->ioh) != 0) {
Index: src/sys/dev/fdt/ohci_fdt.c
diff -u src/sys/dev/fdt/ohci_fdt.c:1.1 src/sys/dev/fdt/ohci_fdt.c:1.2
--- src/sys/dev/fdt/ohci_fdt.c:1.1 Thu Jun 29 17:04:53 2017
+++ src/sys/dev/fdt/ohci_fdt.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_fdt.c,v 1.1 2017/06/29 17:04:53 jmcneill Exp $ */
+/* $NetBSD: ohci_fdt.c,v 1.2 2018/04/09 16:21:10 jakllsch Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_fdt.c,v 1.1 2017/06/29 17:04:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_fdt.c,v 1.2 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -109,8 +109,6 @@ ohci_fdt_attach(device_t parent, device_
sc->sc_bus.ub_hcpriv = sc;
sc->sc_bus.ub_dmatag = faa->faa_dmat;
sc->sc_flags = 0;
- sc->sc_id_vendor = 0;
- strlcpy(sc->sc_vendor, "Generic", sizeof(sc->sc_vendor));
sc->sc_size = size;
sc->iot = faa->faa_bst;
if (bus_space_map(sc->iot, addr, size, 0, &sc->ioh) != 0) {
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.98 src/sys/dev/ic/sl811hs.c:1.99
--- src/sys/dev/ic/sl811hs.c:1.98 Sat Oct 28 00:37:12 2017
+++ src/sys/dev/ic/sl811hs.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.98 2017/10/28 00:37:12 pgoyette Exp $ */
+/* $NetBSD: sl811hs.c,v 1.99 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.98 2017/10/28 00:37:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.99 2018/04/09 16:21:10 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_slhci.h"
@@ -3310,12 +3310,7 @@ slhci_roothub_ctrl(struct usbd_bus *bus,
if (type == UT_READ_DEVICE) {
/* value is type (&0xff00) and index (0xff) */
if (value == (UDESC_DEVICE<<8)) {
- usb_device_descriptor_t devd;
-
- actlen = min(buflen, sizeof(devd));
- memcpy(&devd, buf, actlen);
- USETW(devd.idVendor, USB_VENDOR_SCANLOGIC);
- memcpy(buf, &devd, actlen);
+ actlen = buflen;
error = USBD_NORMAL_COMPLETION;
} else if (value == (UDESC_CONFIG<<8)) {
struct usb_roothub_descriptors confd;
@@ -3329,8 +3324,7 @@ slhci_roothub_ctrl(struct usbd_bus *bus,
error = USBD_NORMAL_COMPLETION;
} else if (value == ((UDESC_STRING<<8)|1)) {
/* Vendor */
- actlen = usb_makestrdesc((usb_string_descriptor_t *)
- buf, len, "ScanLogic/Cypress");
+ actlen = buflen;
error = USBD_NORMAL_COMPLETION;
} else if (value == ((UDESC_STRING<<8)|2)) {
/* Product */
Index: src/sys/dev/marvell/ehci_mv.c
diff -u src/sys/dev/marvell/ehci_mv.c:1.6 src/sys/dev/marvell/ehci_mv.c:1.7
--- src/sys/dev/marvell/ehci_mv.c:1.6 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/marvell/ehci_mv.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_mv.c,v 1.6 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: ehci_mv.c,v 1.7 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.6 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.7 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -235,9 +235,6 @@ mvusb_attach(device_t parent, device_t s
marvell_intr_establish(mva->mva_irq, IPL_USB, ehci_intr, sc);
sc->sc.sc_bus.ub_revision = USBREV_2_0;
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = 0x0000; /* XXXXX */
- strcpy(sc->sc.sc_vendor, "Marvell");
sc->sc.sc_vendor_init = mvusb_vendor_init;
sc->sc.sc_vendor_port_status = mvusb_vendor_port_status;
Index: src/sys/dev/pci/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.65 src/sys/dev/pci/ehci_pci.c:1.66
--- src/sys/dev/pci/ehci_pci.c:1.65 Mon Jun 12 10:59:47 2017
+++ src/sys/dev/pci/ehci_pci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.65 2017/06/12 10:59:47 sborrill Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.66 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.65 2017/06/12 10:59:47 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.66 2018/04/09 16:21:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -206,12 +206,8 @@ ehci_pci_attach(device_t parent, device_
break;
}
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = PCI_VENDOR(pa->pa_id);
- pci_findvendor(sc->sc.sc_vendor,
- sizeof(sc->sc.sc_vendor), sc->sc.sc_id_vendor);
/* Enable workaround for dropped interrupts as required */
- switch (sc->sc.sc_id_vendor) {
+ switch (PCI_VENDOR(pa->pa_id)) {
case PCI_VENDOR_ATI:
case PCI_VENDOR_VIATECH:
sc->sc.sc_flags |= EHCIF_DROPPED_INTR_WORKAROUND;
Index: src/sys/dev/pci/ohci_pci.c
diff -u src/sys/dev/pci/ohci_pci.c:1.56 src/sys/dev/pci/ohci_pci.c:1.57
--- src/sys/dev/pci/ohci_pci.c:1.56 Wed May 10 02:46:33 2017
+++ src/sys/dev/pci/ohci_pci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.56 2017/05/10 02:46:33 msaitoh Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.57 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.56 2017/05/10 02:46:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.57 2018/04/09 16:21:10 jakllsch Exp $");
#include "ehci.h"
@@ -152,10 +152,6 @@ ohci_pci_attach(device_t parent, device_
}
aprint_normal_dev(self, "interrupting at %s\n", intrstr);
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = PCI_VENDOR(pa->pa_id);
- pci_findvendor(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
- sc->sc.sc_id_vendor);
int err = ohci_init(&sc->sc);
if (err) {
aprint_error_dev(self, "init failed, error=%d\n", err);
Index: src/sys/dev/pci/uhci_pci.c
diff -u src/sys/dev/pci/uhci_pci.c:1.61 src/sys/dev/pci/uhci_pci.c:1.62
--- src/sys/dev/pci/uhci_pci.c:1.61 Thu Apr 27 10:01:54 2017
+++ src/sys/dev/pci/uhci_pci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.61 2017/04/27 10:01:54 msaitoh Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.62 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.61 2017/04/27 10:01:54 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.62 2018/04/09 16:21:10 jakllsch Exp $");
#include "ehci.h"
@@ -169,10 +169,6 @@ uhci_pci_attach(device_t parent, device_
break;
}
- /* Figure out vendor for root hub descriptor. */
- sc->sc.sc_id_vendor = PCI_VENDOR(pa->pa_id);
- pci_findvendor(sc->sc.sc_vendor, sizeof(sc->sc.sc_vendor),
- sc->sc.sc_id_vendor);
int err = uhci_init(&sc->sc);
if (err) {
aprint_error_dev(self, "init failed, error=%d\n", err);
Index: src/sys/dev/pci/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.11 src/sys/dev/pci/xhci_pci.c:1.12
--- src/sys/dev/pci/xhci_pci.c:1.11 Thu Dec 28 05:43:42 2017
+++ src/sys/dev/pci/xhci_pci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_pci.c,v 1.11 2017/12/28 05:43:42 msaitoh Exp $ */
+/* $NetBSD: xhci_pci.c,v 1.12 2018/04/09 16:21:10 jakllsch Exp $ */
/* OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.11 2017/12/28 05:43:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.12 2018/04/09 16:21:10 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_xhci_pci.h"
@@ -217,11 +217,6 @@ alloc_retry:
}
aprint_normal_dev(self, "interrupting at %s\n", intrstr);
- /* Figure out vendor for root hub descriptor. */
- sc->sc_id_vendor = PCI_VENDOR(pa->pa_id);
- pci_findvendor(sc->sc_vendor, sizeof(sc->sc_vendor),
- sc->sc_id_vendor);
-
/* Intel chipset requires SuperSpeed enable and USB2 port routing */
switch (PCI_VENDOR(pa->pa_id)) {
case PCI_VENDOR_INTEL:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.257 src/sys/dev/usb/ehci.c:1.258
--- src/sys/dev/usb/ehci.c:1.257 Fri Nov 17 08:22:02 2017
+++ src/sys/dev/usb/ehci.c Mon Apr 9 16:21:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.257 2017/11/17 08:22:02 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.258 2018/04/09 16:21:10 jakllsch Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.257 2017/11/17 08:22:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.258 2018/04/09 16:21:10 jakllsch Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2317,20 +2317,7 @@ ehci_roothub_ctrl(struct usbd_bus *bus,
if (len == 0)
break;
switch (value) {
- case C(0, UDESC_DEVICE): {
- usb_device_descriptor_t devd;
- totlen = min(buflen, sizeof(devd));
- memcpy(&devd, buf, totlen);
- USETW(devd.idVendor, sc->sc_id_vendor);
- memcpy(buf, &devd, totlen);
- break;
-
- }
#define sd ((usb_string_descriptor_t *)buf)
- case C(1, UDESC_STRING):
- /* Vendor */
- totlen = usb_makestrdesc(sd, len, sc->sc_vendor);
- break;
case C(2, UDESC_STRING):
/* Product */
totlen = usb_makestrdesc(sd, len, "EHCI root hub");
Index: src/sys/dev/usb/ehcivar.h
diff -u src/sys/dev/usb/ehcivar.h:1.43 src/sys/dev/usb/ehcivar.h:1.44
--- src/sys/dev/usb/ehcivar.h:1.43 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/ehcivar.h Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcivar.h,v 1.43 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: ehcivar.h,v 1.44 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -177,9 +177,6 @@ typedef struct ehci_softc {
#define EHCIF_DROPPED_INTR_WORKAROUND 0x01
#define EHCIF_ETTF 0x02 /* Emb. Transaction Translater func. */
- char sc_vendor[32]; /* vendor string for root hub */
- int sc_id_vendor; /* vendor ID for root hub */
-
uint32_t sc_cmd; /* shadow of cmd reg during suspend */
u_int sc_ncomp;
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.20 src/sys/dev/usb/motg.c:1.21
--- src/sys/dev/usb/motg.c:1.20 Sun Apr 8 13:36:37 2018
+++ src/sys/dev/usb/motg.c Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.20 2018/04/08 13:36:37 jmcneill Exp $ */
+/* $NetBSD: motg.c,v 1.21 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.20 2018/04/08 13:36:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.21 2018/04/09 16:21:11 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -468,8 +468,6 @@ motg_init(struct motg_softc *sc)
sc->sc_bus.ub_revision = USBREV_2_0;
sc->sc_bus.ub_usedma = false;
sc->sc_bus.ub_hcpriv = sc;
- snprintf(sc->sc_vendor, sizeof(sc->sc_vendor),
- "Mentor Graphics");
sc->sc_child = config_found(sc->sc_dev, &sc->sc_bus, usbctlprint);
return 0;
}
@@ -810,20 +808,7 @@ motg_roothub_ctrl(struct usbd_bus *bus,
case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
DPRINTFN(MD_ROOT, "wValue=0x%04jx", value, 0, 0, 0);
switch (value) {
- case C(0, UDESC_DEVICE): {
- usb_device_descriptor_t devd;
-
- totlen = min(buflen, sizeof(devd));
- memcpy(&devd, buf, totlen);
- USETW(devd.idVendor, sc->sc_id_vendor);
- memcpy(buf, &devd, totlen);
- break;
- }
- case C(1, UDESC_STRING):
#define sd ((usb_string_descriptor_t *)buf)
- /* Vendor */
- totlen = usb_makestrdesc(sd, len, sc->sc_vendor);
- break;
case C(2, UDESC_STRING):
/* Product */
totlen = usb_makestrdesc(sd, len, "MOTG root hub");
Index: src/sys/dev/usb/motgvar.h
diff -u src/sys/dev/usb/motgvar.h:1.5 src/sys/dev/usb/motgvar.h:1.6
--- src/sys/dev/usb/motgvar.h:1.5 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/motgvar.h Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: motgvar.h,v 1.5 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: motgvar.h,v 1.6 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,9 +94,6 @@ struct motg_softc {
/* Info for the root hub interrupt "pipe". */
struct usbd_xfer *sc_intr_xfer; /* root hub interrupt transfer */
- char sc_vendor[32]; /* vendor string for root hub */
- int sc_id_vendor; /* vendor ID for root hub */
-
int sc_port_enabled : 1;
int sc_port_enabled_changed : 1;
int sc_port_suspended : 1;
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.279 src/sys/dev/usb/ohci.c:1.280
--- src/sys/dev/usb/ohci.c:1.279 Sat Feb 3 08:52:52 2018
+++ src/sys/dev/usb/ohci.c Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.279 2018/02/03 08:52:52 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.280 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.279 2018/02/03 08:52:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.280 2018/04/09 16:21:11 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2376,20 +2376,7 @@ ohci_roothub_ctrl(struct usbd_bus *bus,
if (len == 0)
break;
switch (value) {
- case C(0, UDESC_DEVICE): {
- usb_device_descriptor_t devd;
-
- totlen = min(buflen, sizeof(devd));
- memcpy(&devd, buf, totlen);
- USETW(devd.idVendor, sc->sc_id_vendor);
- memcpy(buf, &devd, totlen);
- break;
- }
- case C(1, UDESC_STRING):
#define sd ((usb_string_descriptor_t *)buf)
- /* Vendor */
- totlen = usb_makestrdesc(sd, len, sc->sc_vendor);
- break;
case C(2, UDESC_STRING):
/* Product */
totlen = usb_makestrdesc(sd, len, "OHCI root hub");
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.279 src/sys/dev/usb/uhci.c:1.280
--- src/sys/dev/usb/uhci.c:1.279 Fri Nov 17 08:22:02 2017
+++ src/sys/dev/usb/uhci.c Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.279 2017/11/17 08:22:02 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.280 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.279 2017/11/17 08:22:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.280 2018/04/09 16:21:11 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -3662,20 +3662,7 @@ uhci_roothub_ctrl(struct usbd_bus *bus,
if (len == 0)
break;
switch (value) {
- case C(0, UDESC_DEVICE): {
- usb_device_descriptor_t devd;
-
- totlen = min(buflen, sizeof(devd));
- memcpy(&devd, buf, totlen);
- USETW(devd.idVendor, sc->sc_id_vendor);
- memcpy(buf, &devd, totlen);
- break;
- }
- case C(1, UDESC_STRING):
#define sd ((usb_string_descriptor_t *)buf)
- /* Vendor */
- totlen = usb_makestrdesc(sd, len, sc->sc_vendor);
- break;
case C(2, UDESC_STRING):
/* Product */
totlen = usb_makestrdesc(sd, len, "UHCI root hub");
Index: src/sys/dev/usb/ohcivar.h
diff -u src/sys/dev/usb/ohcivar.h:1.58 src/sys/dev/usb/ohcivar.h:1.59
--- src/sys/dev/usb/ohcivar.h:1.58 Sun May 22 08:02:23 2016
+++ src/sys/dev/usb/ohcivar.h Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcivar.h,v 1.58 2016/05/22 08:02:23 skrll Exp $ */
+/* $NetBSD: ohcivar.h,v 1.59 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -129,9 +129,6 @@ typedef struct ohci_softc {
struct usbd_xfer *sc_intrxfer;
- char sc_vendor[32];
- int sc_id_vendor;
-
uint32_t sc_control; /* Preserved during suspend/standby */
uint32_t sc_intre;
Index: src/sys/dev/usb/uhcivar.h
diff -u src/sys/dev/usb/uhcivar.h:1.53 src/sys/dev/usb/uhcivar.h:1.54
--- src/sys/dev/usb/uhcivar.h:1.53 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uhcivar.h Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.53 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: uhcivar.h,v 1.54 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -188,9 +188,6 @@ typedef struct uhci_softc {
struct usbd_xfer *sc_intr_xfer; /* root hub interrupt transfer */
struct callout sc_poll_handle;
- char sc_vendor[32]; /* vendor string for root hub */
- int sc_id_vendor; /* vendor ID for root hub */
-
device_t sc_child; /* /dev/usb# device */
} uhci_softc_t;
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.86 src/sys/dev/usb/xhci.c:1.87
--- src/sys/dev/usb/xhci.c:1.86 Wed Feb 7 15:55:58 2018
+++ src/sys/dev/usb/xhci.c Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.86 2018/02/07 15:55:58 prlw1 Exp $ */
+/* $NetBSD: xhci.c,v 1.87 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.86 2018/02/07 15:55:58 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.87 2018/04/09 16:21:11 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -3377,19 +3377,7 @@ xhci_roothub_ctrl(struct usbd_bus *bus,
if (len == 0)
break;
switch (value) {
- case C(0, UDESC_DEVICE): {
- usb_device_descriptor_t devd;
- totlen = min(buflen, sizeof(devd));
- memcpy(&devd, buf, totlen);
- USETW(devd.idVendor, sc->sc_id_vendor);
- memcpy(buf, &devd, totlen);
- break;
- }
#define sd ((usb_string_descriptor_t *)buf)
- case C(1, UDESC_STRING):
- /* Vendor */
- totlen = usb_makestrdesc(sd, len, sc->sc_vendor);
- break;
case C(2, UDESC_STRING):
/* Product */
totlen = usb_makestrdesc(sd, len, "xHCI Root Hub");
Index: src/sys/dev/usb/xhcivar.h
diff -u src/sys/dev/usb/xhcivar.h:1.8 src/sys/dev/usb/xhcivar.h:1.9
--- src/sys/dev/usb/xhcivar.h:1.8 Mon Sep 25 00:03:11 2017
+++ src/sys/dev/usb/xhcivar.h Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xhcivar.h,v 1.8 2017/09/25 00:03:11 jmcneill Exp $ */
+/* $NetBSD: xhcivar.h,v 1.9 2018/04/09 16:21:11 jakllsch Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -87,9 +87,6 @@ struct xhci_softc {
kmutex_t sc_intr_lock;
kcondvar_t sc_softwake_cv;
- char sc_vendor[32]; /* vendor string for root hub */
- int sc_id_vendor; /* vendor ID for root hub */
-
pool_cache_t sc_xferpool;
bus_size_t sc_pgsz; /* xHCI page size */
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.48 src/sys/external/bsd/dwc2/dwc2.c:1.49
--- src/sys/external/bsd/dwc2/dwc2.c:1.48 Thu Feb 1 09:55:37 2018
+++ src/sys/external/bsd/dwc2/dwc2.c Mon Apr 9 16:21:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.48 2018/02/01 09:55:37 msaitoh Exp $ */
+/* $NetBSD: dwc2.c,v 1.49 2018/04/09 16:21:11 jakllsch Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.48 2018/02/01 09:55:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.49 2018/04/09 16:21:11 jakllsch Exp $");
#include "opt_usb.h"
@@ -554,10 +554,6 @@ dwc2_roothub_ctrl(struct usbd_bus *bus,
break;
switch (value) {
#define sd ((usb_string_descriptor_t *)buf)
- case C(1, UDESC_STRING):
- /* Vendor */
- //totlen = usb_makestrdesc(sd, len, sc->sc_vendor);
- break;
case C(2, UDESC_STRING):
/* Product */
totlen = usb_makestrdesc(sd, len, "DWC2 root hub");
