Deleted Added
full compact
ehci_pci.c (184610) ehci_pci.c (184824)
1/*-
2 * Copyright (c) 1998 The NetBSD Foundation, Inc.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to The NetBSD Foundation
6 * by Lennart Augustsson (augustss@carlstedt.se) at
7 * Carlstedt Research & Technology.
8 *

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

31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 The NetBSD Foundation, Inc.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to The NetBSD Foundation
6 * by Lennart Augustsson (augustss@carlstedt.se) at
7 * Carlstedt Research & Technology.
8 *

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

31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ehci2_pci.c 184610 2008-11-04 02:31:03Z alfred $");
39__FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ehci2_pci.c 184824 2008-11-10 20:54:31Z thompsa $");
40
41/*
42 * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
43 *
44 * The EHCI 1.0 spec can be found at
45 * http://developer.intel.com/technology/usb/download/ehci-r10.pdf
46 * and the USB 2.0 spec at
47 * http://www.usb.org/developers/docs/usb_20.zip

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

332 break;
333 default:
334 if (bootverbose)
335 device_printf(self, "(New EHCI DeviceId=0x%08x)\n",
336 pci_get_devid(self));
337 sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
338 }
339
40
41/*
42 * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
43 *
44 * The EHCI 1.0 spec can be found at
45 * http://developer.intel.com/technology/usb/download/ehci-r10.pdf
46 * and the USB 2.0 spec at
47 * http://www.usb.org/developers/docs/usb_20.zip

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

332 break;
333 default:
334 if (bootverbose)
335 device_printf(self, "(New EHCI DeviceId=0x%08x)\n",
336 pci_get_devid(self));
337 sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
338 }
339
340 err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.mtx,
340 err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx,
341 NULL, 0, 4);
342 if (err) {
343 device_printf(self, "could not setup config thread!\n");
344 goto error;
345 }
346#if (__FreeBSD_version >= 700031)
347 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
348 NULL, (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl);

--- 150 unchanged lines hidden ---
341 NULL, 0, 4);
342 if (err) {
343 device_printf(self, "could not setup config thread!\n");
344 goto error;
345 }
346#if (__FreeBSD_version >= 700031)
347 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
348 NULL, (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl);

--- 150 unchanged lines hidden ---