Deleted Added
full compact
zy7_ehci.c (261410) zy7_ehci.c (276717)
1/*-
2 * Copyright (c) 2012-2013 Thomas Skibo
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2012-2013 Thomas Skibo
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/arm/xilinx/zy7_ehci.c 261410 2014-02-02 19:17:28Z ian $
26 * $FreeBSD: head/sys/arm/xilinx/zy7_ehci.c 276717 2015-01-05 20:22:18Z hselasky $
27 */
28
29/*
30 * A host-controller driver for Zynq-7000's USB OTG controller.
31 *
32 * Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
33 * (v1.4) November 16, 2012. Xilinx doc UG585. Ch. 15 covers the USB
34 * controller and register definitions are in appendix B.34.
35 */
36
37
38#include <sys/cdefs.h>
27 */
28
29/*
30 * A host-controller driver for Zynq-7000's USB OTG controller.
31 *
32 * Reference: Zynq-7000 All Programmable SoC Technical Reference Manual.
33 * (v1.4) November 16, 2012. Xilinx doc UG585. Ch. 15 covers the USB
34 * controller and register definitions are in appendix B.34.
35 */
36
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_ehci.c 261410 2014-02-02 19:17:28Z ian $");
39__FBSDID("$FreeBSD: head/sys/arm/xilinx/zy7_ehci.c 276717 2015-01-05 20:22:18Z hselasky $");
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/bus.h>
44#include <sys/conf.h>
45#include <sys/kernel.h>
46#include <sys/lock.h>
47#include <sys/module.h>

--- 163 unchanged lines hidden (view full) ---

211 ehci_softc_t *sc = device_get_softc(dev);
212 bus_space_handle_t bsh;
213 int err, rid;
214
215 /* initialize some bus fields */
216 sc->sc_bus.parent = dev;
217 sc->sc_bus.devices = sc->sc_devices;
218 sc->sc_bus.devices_max = EHCI_MAX_DEVICES;
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/bus.h>
44#include <sys/conf.h>
45#include <sys/kernel.h>
46#include <sys/lock.h>
47#include <sys/module.h>

--- 163 unchanged lines hidden (view full) ---

211 ehci_softc_t *sc = device_get_softc(dev);
212 bus_space_handle_t bsh;
213 int err, rid;
214
215 /* initialize some bus fields */
216 sc->sc_bus.parent = dev;
217 sc->sc_bus.devices = sc->sc_devices;
218 sc->sc_bus.devices_max = EHCI_MAX_DEVICES;
219 sc->sc_bus.dma_bits = 32;
219
220 /* get all DMA memory */
221 if (usb_bus_mem_alloc_all(&sc->sc_bus,
222 USB_GET_DMA_TAG(dev), &ehci_iterate_hw_softc))
223 return (ENOMEM);
224
225 /* Allocate memory. */
226 rid = 0;

--- 139 unchanged lines hidden ---
220
221 /* get all DMA memory */
222 if (usb_bus_mem_alloc_all(&sc->sc_bus,
223 USB_GET_DMA_TAG(dev), &ehci_iterate_hw_softc))
224 return (ENOMEM);
225
226 /* Allocate memory. */
227 rid = 0;

--- 139 unchanged lines hidden ---