Module Name: src
Committed By: macallan
Date: Tue Mar 17 09:27:09 UTC 2015
Modified Files:
src/sys/arch/mips/ingenic: ingenic_dwctwo.c ingenic_ehci.c
ingenic_ohci.c
Log Message:
set root hub vendor IDs
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/ingenic/ingenic_dwctwo.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ingenic/ingenic_ehci.c \
src/sys/arch/mips/ingenic/ingenic_ohci.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/mips/ingenic/ingenic_dwctwo.c
diff -u src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.8 src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.9
--- src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.8 Tue Mar 17 07:25:07 2015
+++ src/sys/arch/mips/ingenic/ingenic_dwctwo.c Tue Mar 17 09:27:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_dwctwo.c,v 1.8 2015/03/17 07:25:07 macallan Exp $ */
+/* $NetBSD: ingenic_dwctwo.c,v 1.9 2015/03/17 09:27:09 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_dwctwo.c,v 1.8 2015/03/17 07:25:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_dwctwo.c,v 1.9 2015/03/17 09:27:09 macallan Exp $");
/*
* adapted from bcm2835_dwctwo.c
@@ -47,9 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: ingenic_dwct
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
+#include <dev/usb/usbdevs.h>
#include <dwc2/dwc2var.h>
-
#include <dwc2/dwc2.h>
#include "dwc2_core.h"
@@ -202,6 +202,8 @@ ingenic_dwc2_deferred(device_t self)
struct ingenic_dwc2_softc *sc = device_private(self);
int error;
+ sc->sc_dwc2.sc_id_vendor = USB_VENDOR_INGENIC;
+ strlcpy(sc->sc_dwc2.sc_vendor, "Ingenic", sizeof(sc->sc_dwc2.sc_vendor));
error = dwc2_init(&sc->sc_dwc2);
if (error != 0) {
aprint_error_dev(self, "couldn't initialize host, error=%d\n",
Index: src/sys/arch/mips/ingenic/ingenic_ehci.c
diff -u src/sys/arch/mips/ingenic/ingenic_ehci.c:1.2 src/sys/arch/mips/ingenic/ingenic_ehci.c:1.3
--- src/sys/arch/mips/ingenic/ingenic_ehci.c:1.2 Tue Mar 17 07:25:07 2015
+++ src/sys/arch/mips/ingenic/ingenic_ehci.c Tue Mar 17 09:27:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_ehci.c,v 1.2 2015/03/17 07:25:07 macallan Exp $ */
+/* $NetBSD: ingenic_ehci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.2 2015/03/17 07:25:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_ehci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: ingenic_ehci
#include <dev/usb/ehcireg.h>
#include <dev/usb/ehcivar.h>
+#include <dev/usb/usbdevs.h>
+
#include "opt_ingenic.h"
#include "ohci.h"
@@ -131,6 +133,8 @@ ingenic_ehci_attach(device_t parent, dev
#else
sc->sc_ncomp = 0;
#endif
+ sc->sc_id_vendor = USB_VENDOR_INGENIC;
+ strlcpy(sc->sc_vendor, "Ingenic", sizeof(sc->sc_vendor));
status = ehci_init(sc);
if (status != USBD_NORMAL_COMPLETION) {
Index: src/sys/arch/mips/ingenic/ingenic_ohci.c
diff -u src/sys/arch/mips/ingenic/ingenic_ohci.c:1.2 src/sys/arch/mips/ingenic/ingenic_ohci.c:1.3
--- src/sys/arch/mips/ingenic/ingenic_ohci.c:1.2 Tue Mar 17 07:25:07 2015
+++ src/sys/arch/mips/ingenic/ingenic_ohci.c Tue Mar 17 09:27:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_ohci.c,v 1.2 2015/03/17 07:25:07 macallan Exp $ */
+/* $NetBSD: ingenic_ohci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_ohci.c,v 1.2 2015/03/17 07:25:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_ohci.c,v 1.3 2015/03/17 09:27:09 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ingenic_ohci
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
+#include <dev/usb/usbdevs.h>
#include <dev/usb/ohcireg.h>
#include <dev/usb/ohcivar.h>
@@ -110,9 +111,11 @@ ingenic_ohci_attach(device_t parent, dev
goto fail;
}
- /* we don't handle endianess in bus space */
sc->sc_endian = OHCI_LITTLE_ENDIAN;
+ sc->sc_id_vendor = USB_VENDOR_INGENIC;
+ strlcpy(sc->sc_vendor, "Ingenic", sizeof(sc->sc_vendor));
+
status = ohci_init(sc);
if (status != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "init failed, error=%d\n", status);
