Deleted Added
full compact
uhci_pci.c (187172) uhci_pci.c (187186)
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/uhci2_pci.c 187172 2009-01-13 19:03:01Z thompsa $");
39__FBSDID("$FreeBSD: head/sys/dev/usb2/controller/uhci2_pci.c 187186 2009-01-13 19:14:51Z thompsa $");
40
41/* Universal Host Controller Interface
42 *
43 * UHCI spec: http://www.intel.com/
44 */
45
46/* The low level controller code for UHCI has been split into
47 * PCI probes and UHCI specific code. This was done to facilitate the

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

315 switch (pci_read_config(self, PCI_USBREV, 1) & PCI_USB_REV_MASK) {
316 case PCI_USB_REV_PRE_1_0:
317 sc->sc_bus.usbrev = USB_REV_PRE_1_0;
318 break;
319 case PCI_USB_REV_1_0:
320 sc->sc_bus.usbrev = USB_REV_1_0;
321 break;
322 default:
40
41/* Universal Host Controller Interface
42 *
43 * UHCI spec: http://www.intel.com/
44 */
45
46/* The low level controller code for UHCI has been split into
47 * PCI probes and UHCI specific code. This was done to facilitate the

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

315 switch (pci_read_config(self, PCI_USBREV, 1) & PCI_USB_REV_MASK) {
316 case PCI_USB_REV_PRE_1_0:
317 sc->sc_bus.usbrev = USB_REV_PRE_1_0;
318 break;
319 case PCI_USB_REV_1_0:
320 sc->sc_bus.usbrev = USB_REV_1_0;
321 break;
322 default:
323 sc->sc_bus.usbrev = USB_REV_UNKNOWN;
323 /* Quirk for Parallels Desktop 4.0 */
324 device_printf(self, "USB revision is unknown. Assuming v1.1.\n");
325 sc->sc_bus.usbrev = USB_REV_1_1;
324 break;
325 }
326
327#if (__FreeBSD_version >= 700031)
328 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
329 NULL, (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl);
330#else
331 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,

--- 115 unchanged lines hidden ---
326 break;
327 }
328
329#if (__FreeBSD_version >= 700031)
330 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
331 NULL, (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl);
332#else
333 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,

--- 115 unchanged lines hidden ---