Module Name: src
Committed By: skrll
Date: Sat Mar 19 14:16:46 UTC 2016
Modified Files:
src/sys/arch/arm/samsung [nick-nhusb]: exynos_ehci.c exynos_ohci.c
Log Message:
Adapt to the branch.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/samsung/exynos_ehci.c \
src/sys/arch/arm/samsung/exynos_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/arm/samsung/exynos_ehci.c
diff -u src/sys/arch/arm/samsung/exynos_ehci.c:1.1.2.2 src/sys/arch/arm/samsung/exynos_ehci.c:1.1.2.3
--- src/sys/arch/arm/samsung/exynos_ehci.c:1.1.2.2 Sat Mar 19 11:29:57 2016
+++ src/sys/arch/arm/samsung/exynos_ehci.c Sat Mar 19 14:16:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ehci.c,v 1.1.2.2 2016/03/19 11:29:57 skrll Exp $ */
+/* $NetBSD: exynos_ehci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll 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.1.2.2 2016/03/19 11:29:57 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_ehci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,9 +95,9 @@ exynos_ehci_attach(device_t parent, devi
sc->sc_dev = self;
sc->iot = faa->faa_bst;
sc->sc_size = size;
- sc->sc_bus.dmatag = faa->faa_dmat;
- sc->sc_bus.hci_private = sc;
- sc->sc_bus.usbrev = USBREV_2_0;
+ sc->sc_bus.ub_dmatag = faa->faa_dmat;
+ 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));
Index: src/sys/arch/arm/samsung/exynos_ohci.c
diff -u src/sys/arch/arm/samsung/exynos_ohci.c:1.1.2.2 src/sys/arch/arm/samsung/exynos_ohci.c:1.1.2.3
--- src/sys/arch/arm/samsung/exynos_ohci.c:1.1.2.2 Sat Mar 19 11:29:57 2016
+++ src/sys/arch/arm/samsung/exynos_ohci.c Sat Mar 19 14:16:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ohci.c,v 1.1.2.2 2016/03/19 11:29:57 skrll Exp $ */
+/* $NetBSD: exynos_ohci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_ohci.c,v 1.1.2.2 2016/03/19 11:29:57 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_ohci.c,v 1.1.2.3 2016/03/19 14:16:46 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,8 +95,8 @@ exynos_ohci_attach(device_t parent, devi
sc->sc_dev = self;
sc->iot = faa->faa_bst;
sc->sc_size = size;
- sc->sc_bus.dmatag = faa->faa_dmat;
- sc->sc_bus.hci_private = sc;
+ sc->sc_bus.ub_dmatag = faa->faa_dmat;
+ sc->sc_bus.ub_hcpriv = sc;
error = bus_space_map(sc->iot, addr, size, 0, &sc->ioh);
if (error) {
