Deleted Added
full compact
ehci_ixp4xx.c (302408) ehci_ixp4xx.c (305614)
1/*-
2 * Copyright (c) 2008 Sam Leffler. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25/*
26 * IXP435 attachment driver for the USB Enhanced Host Controller.
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 Sam Leffler. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25/*
26 * IXP435 attachment driver for the USB Enhanced Host Controller.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: stable/11/sys/dev/usb/controller/ehci_ixp4xx.c 294989 2016-01-28 14:11:59Z mmel $");
30__FBSDID("$FreeBSD: stable/11/sys/dev/usb/controller/ehci_ixp4xx.c 305614 2016-09-08 15:05:25Z pfg $");
31
32#include "opt_bus.h"
33
34#include <sys/stdint.h>
35#include <sys/stddef.h>
36#include <sys/param.h>
37#include <sys/queue.h>
38#include <sys/types.h>

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

142 * byte-alignment of non-word addresses. Also, since
143 * we're already intercepting bus space ops we handle
144 * the register window offset that could otherwise be
145 * done with bus_space_subregion.
146 */
147 isc->iot = rman_get_bustag(sc->sc_io_res);
148 isc->tag.bs_privdata = isc->iot;
149 /* read single */
31
32#include "opt_bus.h"
33
34#include <sys/stdint.h>
35#include <sys/stddef.h>
36#include <sys/param.h>
37#include <sys/queue.h>
38#include <sys/types.h>

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

142 * byte-alignment of non-word addresses. Also, since
143 * we're already intercepting bus space ops we handle
144 * the register window offset that could otherwise be
145 * done with bus_space_subregion.
146 */
147 isc->iot = rman_get_bustag(sc->sc_io_res);
148 isc->tag.bs_privdata = isc->iot;
149 /* read single */
150 isc->tag.bs_r_1 = ehci_bs_r_1,
151 isc->tag.bs_r_2 = ehci_bs_r_2,
152 isc->tag.bs_r_4 = ehci_bs_r_4,
150 isc->tag.bs_r_1 = ehci_bs_r_1;
151 isc->tag.bs_r_2 = ehci_bs_r_2;
152 isc->tag.bs_r_4 = ehci_bs_r_4;
153 /* write (single) */
153 /* write (single) */
154 isc->tag.bs_w_1 = ehci_bs_w_1,
155 isc->tag.bs_w_2 = ehci_bs_w_2,
156 isc->tag.bs_w_4 = ehci_bs_w_4,
154 isc->tag.bs_w_1 = ehci_bs_w_1;
155 isc->tag.bs_w_2 = ehci_bs_w_2;
156 isc->tag.bs_w_4 = ehci_bs_w_4;
157
158 sc->sc_io_tag = &isc->tag;
159 sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
160 sc->sc_io_size = IXP435_USB1_SIZE - 0x100;
161
162 rid = 0;
163 sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid,
164 RF_ACTIVE);

--- 163 unchanged lines hidden ---
157
158 sc->sc_io_tag = &isc->tag;
159 sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
160 sc->sc_io_size = IXP435_USB1_SIZE - 0x100;
161
162 rid = 0;
163 sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid,
164 RF_ACTIVE);

--- 163 unchanged lines hidden ---