| at91_ohci.c (190174) | at91_ohci.c (190183) |
|---|---|
| 1/*- 2 * Copyright (c) 2006 M. Warner Losh. 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. --- 9 unchanged lines hidden (view full) --- 18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 */ 24 25#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2006 M. Warner Losh. 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. --- 9 unchanged lines hidden (view full) --- 18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 */ 24 25#include <sys/cdefs.h> |
| 26__FBSDID("$FreeBSD: head/sys/dev/usb/controller/ohci_atmelarm.c 190174 2009-03-20 19:04:31Z thompsa $"); | 26__FBSDID("$FreeBSD: head/sys/dev/usb/controller/ohci_atmelarm.c 190183 2009-03-20 21:57:54Z thompsa $"); |
| 27 28#include <dev/usb/usb_mfunc.h> 29#include <dev/usb/usb.h> 30 31#include <dev/usb/usb_core.h> 32#include <dev/usb/usb_busdma.h> 33#include <dev/usb/usb_process.h> 34#include <dev/usb/usb_sw_transfer.h> --- 71 unchanged lines hidden (view full) --- 106 goto error; 107 } 108 device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); 109 110 strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); 111 112#if (__FreeBSD_version >= 700031) 113 err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, | 27 28#include <dev/usb/usb_mfunc.h> 29#include <dev/usb/usb.h> 30 31#include <dev/usb/usb_core.h> 32#include <dev/usb/usb_busdma.h> 33#include <dev/usb/usb_process.h> 34#include <dev/usb/usb_sw_transfer.h> --- 71 unchanged lines hidden (view full) --- 106 goto error; 107 } 108 device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); 109 110 strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); 111 112#if (__FreeBSD_version >= 700031) 113 err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, |
| 114 NULL, (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); | 114 NULL, (driver_intr_t *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); |
| 115#else 116 err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, | 115#else 116 err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, |
| 117 (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); | 117 (driver_intr_t *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); |
| 118#endif 119 if (err) { 120 sc->sc_ohci.sc_intr_hdl = NULL; 121 goto error; 122 } 123 /* 124 * turn on the clocks from the AT91's point of view. Keep the unit in reset. 125 */ --- 97 unchanged lines hidden --- | 118#endif 119 if (err) { 120 sc->sc_ohci.sc_intr_hdl = NULL; 121 goto error; 122 } 123 /* 124 * turn on the clocks from the AT91's point of view. Keep the unit in reset. 125 */ --- 97 unchanged lines hidden --- |