Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mips/ingenic set root hub vendor IDs
details: https://anonhg.NetBSD.org/src/rev/08257988d8a2
branches: trunk
changeset: 336754:08257988d8a2
user: macallan <macallan%NetBSD.org@localhost>
date: Tue Mar 17 09:27:09 2015 +0000
description:
set root hub vendor IDs
diffstat:
sys/arch/mips/ingenic/ingenic_dwctwo.c | 8 +++++---
sys/arch/mips/ingenic/ingenic_ehci.c | 8 ++++++--
sys/arch/mips/ingenic/ingenic_ohci.c | 9 ++++++---
3 files changed, 17 insertions(+), 8 deletions(-)
diffs (113 lines):
diff -r cd9969b1ada8 -r 08257988d8a2 sys/arch/mips/ingenic/ingenic_dwctwo.c
--- a/sys/arch/mips/ingenic/ingenic_dwctwo.c Tue Mar 17 09:26:31 2015 +0000
+++ b/sys/arch/mips/ingenic/ingenic_dwctwo.c Tue Mar 17 09:27:09 2015 +0000
@@ -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 @@
#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 @@
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",
diff -r cd9969b1ada8 -r 08257988d8a2 sys/arch/mips/ingenic/ingenic_ehci.c
--- a/sys/arch/mips/ingenic/ingenic_ehci.c Tue Mar 17 09:26:31 2015 +0000
+++ b/sys/arch/mips/ingenic/ingenic_ehci.c Tue Mar 17 09:27:09 2015 +0000
@@ -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 @@
#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 @@
#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) {
diff -r cd9969b1ada8 -r 08257988d8a2 sys/arch/mips/ingenic/ingenic_ohci.c
--- a/sys/arch/mips/ingenic/ingenic_ohci.c Tue Mar 17 09:26:31 2015 +0000
+++ b/sys/arch/mips/ingenic/ingenic_ohci.c Tue Mar 17 09:27:09 2015 +0000
@@ -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 @@
#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 @@
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);
Home |
Main Index |
Thread Index |
Old Index