Deleted Added
full compact
uhci_pci.c (190174) uhci_pci.c (190183)
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/uhci_pci.c 190174 2009-03-20 19:04:31Z thompsa $");
39__FBSDID("$FreeBSD: head/sys/dev/usb/controller/uhci_pci.c 190183 2009-03-20 21:57:54Z 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

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

318 /* Quirk for Parallels Desktop 4.0 */
319 device_printf(self, "USB revision is unknown. Assuming v1.1.\n");
320 sc->sc_bus.usbrev = USB_REV_1_1;
321 break;
322 }
323
324#if (__FreeBSD_version >= 700031)
325 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
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

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

318 /* Quirk for Parallels Desktop 4.0 */
319 device_printf(self, "USB revision is unknown. Assuming v1.1.\n");
320 sc->sc_bus.usbrev = USB_REV_1_1;
321 break;
322 }
323
324#if (__FreeBSD_version >= 700031)
325 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
326 NULL, (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl);
326 NULL, (driver_intr_t *)uhci_interrupt, sc, &sc->sc_intr_hdl);
327#else
328 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
327#else
328 err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
329 (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl);
329 (driver_intr_t *)uhci_interrupt, sc, &sc->sc_intr_hdl);
330#endif
331
332 if (err) {
333 device_printf(self, "Could not setup irq, %d\n", err);
334 sc->sc_intr_hdl = NULL;
335 goto error;
336 }
337 /*

--- 104 unchanged lines hidden ---
330#endif
331
332 if (err) {
333 device_printf(self, "Could not setup irq, %d\n", err);
334 sc->sc_intr_hdl = NULL;
335 goto error;
336 }
337 /*

--- 104 unchanged lines hidden ---