[src/trunk]: src/sys/arch XU4 USB snapshot: Reorganize source files

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch XU4 USB snapshot: Reorganize source files
From: marty <marty%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 19:49:56 +0000
details:   https://anonhg.NetBSD.org/src/rev/77fd4f83dc52
branches:  trunk
changeset: 342536:77fd4f83dc52
user:      marty <marty%NetBSD.org@localhost>
date:      Sun Dec 27 02:54:12 2015 +0000

description:
XU4 USB snapshot: Reorganize source files

This is just a skeleton,  not a set of drivers, but the pieces are now
more or less in the right places.

diffstat:

 sys/arch/arm/samsung/exynos_ehci.c   |  124 +++++++++++++
 sys/arch/arm/samsung/exynos_ohci.c   |  121 +++++++++++++
 sys/arch/arm/samsung/exynos_usb.c    |  325 -----------------------------------
 sys/arch/arm/samsung/exynos_usb3.c   |  180 +++++++++++++++++++
 sys/arch/arm/samsung/exynos_usbphy.c |  109 +++++++++++
 sys/arch/arm/samsung/files.exynos    |   26 ++-
 sys/arch/evbarm/conf/EXYNOS          |   17 +-
 7 files changed, 564 insertions(+), 338 deletions(-)

diffs (truncated from 955 to 300 lines):

diff -r 3c3cd808c601 -r 77fd4f83dc52 sys/arch/arm/samsung/exynos_ehci.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/samsung/exynos_ehci.c        Sun Dec 27 02:54:12 2015 +0000
@@ -0,0 +1,124 @@
+/*     $NetBSD: exynos_ehci.c,v 1.1 2015/12/27 02:54:12 marty Exp $    */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Reinoud Zandijk.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 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.
+ */
+
+#include "locators.h"
+#include "ohci.h"
+#include "ehci.h"
+
+#include <sys/cdefs.h>
+
+__KERNEL_RCSID(1, "$NetBSD: exynos_ehci.c,v 1.1 2015/12/27 02:54:12 marty Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/kmem.h>
+#include <sys/gpio.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
+#include <dev/usb/usb_mem.h>
+
+#include <dev/usb/ehcireg.h>
+#include <dev/usb/ehcivar.h>
+
+#include <arm/samsung/exynos_reg.h>
+#include <arm/samsung/exynos_var.h>
+
+#include <dev/fdt/fdtvar.h>
+
+static int     exynos_ehci_match(device_t, cfdata_t, void *);
+static void    exynos_ehci_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(exynos_ehci, sizeof(struct ehci_softc),
+    exynos_ehci_match, exynos_ehci_attach, NULL, NULL);
+
+
+static int
+exynos_ehci_match(device_t parent, cfdata_t cf, void *aux)
+{
+       const char * const compatible[] = { "samsung,exynos5-ehci",
+                                           NULL };
+       struct fdt_attach_args * const faa = aux;
+       return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+
+static void
+exynos_ehci_attach(device_t parent, device_t self, void *aux)
+{
+       struct ehci_softc *sc = device_private(self);
+       struct fdt_attach_args * const faa = aux;
+       bus_addr_t addr;
+       bus_size_t size;
+       int error;
+       int r;
+
+       if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
+               aprint_error(": couldn't get registers\n");
+               return;
+       }
+
+       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_ncomp = 0;
+       strlcpy(sc->sc_vendor, "exynos", sizeof(sc->sc_vendor));
+
+       error = bus_space_map(sc->iot, addr, size, 0, &sc->ioh);
+       if (error) {
+               aprint_error(": couldn't map %#llx: %d",
+                            (uint64_t)addr, error);
+               return;
+       }
+
+
+       aprint_naive(": EHCI USB controller\n");
+       aprint_normal(": EHCI NOT IMPLEMENTED\n");
+
+       /* attach */
+       r = ehci_init(sc);
+       if (r != USBD_NORMAL_COMPLETION) {
+               aprint_error_dev(self, "init failed, error = %d\n", r);
+               /* disable : TBD */
+               return;
+       }
+       sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+}
diff -r 3c3cd808c601 -r 77fd4f83dc52 sys/arch/arm/samsung/exynos_ohci.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/samsung/exynos_ohci.c        Sun Dec 27 02:54:12 2015 +0000
@@ -0,0 +1,121 @@
+/*     $NetBSD: exynos_ohci.c,v 1.1 2015/12/27 02:54:12 marty Exp $    */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Reinoud Zandijk.
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 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.
+ */
+
+#include "locators.h"
+#include "ohci.h"
+#include "ehci.h"
+
+#include <sys/cdefs.h>
+
+__KERNEL_RCSID(1, "$NetBSD: exynos_ohci.c,v 1.1 2015/12/27 02:54:12 marty Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/kmem.h>
+#include <sys/gpio.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
+#include <dev/usb/usb_mem.h>
+
+#include <dev/usb/ohcireg.h>
+#include <dev/usb/ohcivar.h>
+
+#include <arm/samsung/exynos_reg.h>
+#include <arm/samsung/exynos_var.h>
+
+#include <dev/fdt/fdtvar.h>
+
+static int     exynos_ohci_match(device_t, cfdata_t, void *);
+static void    exynos_ohci_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(exynos_ohci, sizeof(struct ohci_softc),
+    exynos_ohci_match, exynos_ohci_attach, NULL, NULL);
+
+
+static int
+exynos_ohci_match(device_t parent, cfdata_t cf, void *aux)
+{
+       const char * const compatible[] = { "samsung,exynos5-ohci",
+                                           NULL };
+       struct fdt_attach_args * const faa = aux;
+       return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+
+static void
+exynos_ohci_attach(device_t parent, device_t self, void *aux)
+{
+       struct ohci_softc *sc = device_private(self);
+       struct fdt_attach_args * const faa = aux;
+       bus_addr_t addr;
+       bus_size_t size;
+       int error;
+       int r;
+
+       if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
+               aprint_error(": couldn't get registers\n");
+               return;
+       }
+
+       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;
+
+       error = bus_space_map(sc->iot, addr, size, 0, &sc->ioh);
+       if (error) {
+               aprint_error(": couldn't map %#llx: %d",
+                            (uint64_t)addr, error);
+               return;
+       }
+
+       aprint_naive(": OHCI USB controller\n");
+       aprint_normal(": OHCI NOT IMPLEMENTED\n");
+
+       /* attach */
+       r = ohci_init(sc);
+       if (r != USBD_NORMAL_COMPLETION) {
+               aprint_error_dev(self, "init failed, error = %d\n", r);
+               /* disable : TBD */
+               return;
+       }
+       sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
+}
+
diff -r 3c3cd808c601 -r 77fd4f83dc52 sys/arch/arm/samsung/exynos_usb.c
--- a/sys/arch/arm/samsung/exynos_usb.c Sun Dec 27 02:43:42 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,325 +0,0 @@
-/*     $NetBSD: exynos_usb.c,v 1.15 2015/12/21 04:58:50 marty Exp $    */
-
-/*-
- * Copyright (c) 2014 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Reinoud Zandijk.
- *
- * 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
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 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.
- */
-
-#include "locators.h"
-#include "ohci.h"
-#include "ehci.h"
-
-#include <sys/cdefs.h>
-
-__KERNEL_RCSID(1, "$NetBSD: exynos_usb.c,v 1.15 2015/12/21 04:58:50 marty Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/intr.h>
Prev by Date: [src/trunk]: src/tests/sbin/gpt I was right - the output from gpt(8) did grow...
Next by Date: [src/trunk]: src/tests/rump/modautoload Remove a left-over debugging variable...
Previous by Thread: [src/trunk]: src/tests/sbin/gpt I was right - the output from gpt(8) did grow...
Next by Thread: [src/trunk]: src/tests/rump/modautoload Remove a left-over debugging variable...
Indexes:
Home | Main Index | Thread Index | Old Index