Deleted Added
full compact
ehci_pci.c (200822) ehci_pci.c (203693)
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/usb/controller/ehci_pci.c 200822 2009-12-22 01:57:34Z thompsa $");
39__FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci_pci.c 203693 2010-02-09 00:38:40Z 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

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

461 if (bootverbose)
462 device_printf(self,
463 "Dropped interrupts workaround enabled\n");
464 break;
465 default:
466 break;
467 }
468
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

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

461 if (bootverbose)
462 device_printf(self,
463 "Dropped interrupts workaround enabled\n");
464 break;
465 default:
466 break;
467 }
468
469 /* Doorbell feature workaround */
470 switch (pci_get_vendor(self)) {
471 case PCI_EHCI_VENDORID_NVIDIA:
472 case PCI_EHCI_VENDORID_NVIDIA2:
473 sc->sc_flags |= EHCI_SCFLG_IAADBUG;
474 if (bootverbose)
475 device_printf(self,
476 "Doorbell workaround enabled\n");
477 break;
478 default:
479 break;
480 }
481
469 err = ehci_init(sc);
470 if (!err) {
471 err = device_probe_and_attach(sc->sc_bus.bdev);
472 }
473 if (err) {
474 device_printf(self, "USB init failed err=%d\n", err);
475 goto error;
476 }

--- 125 unchanged lines hidden ---
482 err = ehci_init(sc);
483 if (!err) {
484 err = device_probe_and_attach(sc->sc_bus.bdev);
485 }
486 if (err) {
487 device_printf(self, "USB init failed err=%d\n", err);
488 goto error;
489 }

--- 125 unchanged lines hidden ---