| ohci_atmelarm.c (184610) | ohci_atmelarm.c (184824) |
|---|---|
| 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/usb2/controller/ohci2_atmelarm.c 184610 2008-11-04 02:31:03Z alfred $"); | 26__FBSDID("$FreeBSD: head/sys/dev/usb2/controller/ohci2_atmelarm.c 184824 2008-11-10 20:54:31Z thompsa $"); |
| 27 28#include <dev/usb2/include/usb2_mfunc.h> 29#include <dev/usb2/include/usb2_defs.h> 30#include <dev/usb2/include/usb2_standard.h> 31 32#include <dev/usb2/core/usb2_core.h> 33#include <dev/usb2/core/usb2_busdma.h> 34#include <dev/usb2/core/usb2_process.h> --- 71 unchanged lines hidden (view full) --- 106 if (!(sc->sc_ohci.sc_bus.bdev)) { 107 goto error; 108 } 109 device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); 110 111 strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); 112 113 err = usb2_config_td_setup(&sc->sc_ohci.sc_config_td, sc, | 27 28#include <dev/usb2/include/usb2_mfunc.h> 29#include <dev/usb2/include/usb2_defs.h> 30#include <dev/usb2/include/usb2_standard.h> 31 32#include <dev/usb2/core/usb2_core.h> 33#include <dev/usb2/core/usb2_busdma.h> 34#include <dev/usb2/core/usb2_process.h> --- 71 unchanged lines hidden (view full) --- 106 if (!(sc->sc_ohci.sc_bus.bdev)) { 107 goto error; 108 } 109 device_set_ivars(sc->sc_ohci.sc_bus.bdev, &sc->sc_ohci.sc_bus); 110 111 strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); 112 113 err = usb2_config_td_setup(&sc->sc_ohci.sc_config_td, sc, |
| 114 &sc->sc_ohci.sc_bus.mtx, NULL, 0, 4); | 114 &sc->sc_ohci.sc_bus.bus_mtx, NULL, 0, 4); |
| 115 if (err) { 116 device_printf(dev, "could not setup config thread!\n"); 117 goto error; 118 } 119#if (__FreeBSD_version >= 700031) 120 err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, 121 NULL, (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); 122#else --- 110 unchanged lines hidden --- | 115 if (err) { 116 device_printf(dev, "could not setup config thread!\n"); 117 goto error; 118 } 119#if (__FreeBSD_version >= 700031) 120 err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, 121 NULL, (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); 122#else --- 110 unchanged lines hidden --- |