Deleted Added
full compact
fwohci_pci.c (170374) fwohci_pci.c (187993)
1/*-
2 * Copyright (c) 2003 Hidetoshi Shimokawa
3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32 * POSSIBILITY OF SUCH DAMAGE.
33 *
1/*-
2 * Copyright (c) 2003 Hidetoshi Shimokawa
3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32 * POSSIBILITY OF SUCH DAMAGE.
33 *
34 * $FreeBSD: head/sys/dev/firewire/fwohci_pci.c 170374 2007-06-06 14:31:36Z simokawa $
34 * $FreeBSD: head/sys/dev/firewire/fwohci_pci.c 187993 2009-02-01 23:28:52Z sbruno $
35 */
36
37#define BOUNCE_BUFFER_TEST 0
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/kernel.h>
42#include <sys/module.h>

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

329 RF_SHAREABLE | RF_ACTIVE);
330#endif
331 if (sc->irq_res == NULL) {
332 device_printf(self, "Could not allocate irq\n");
333 fwohci_pci_detach(self);
334 return ENXIO;
335 }
336
35 */
36
37#define BOUNCE_BUFFER_TEST 0
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/kernel.h>
42#include <sys/module.h>

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

329 RF_SHAREABLE | RF_ACTIVE);
330#endif
331 if (sc->irq_res == NULL) {
332 device_printf(self, "Could not allocate irq\n");
333 fwohci_pci_detach(self);
334 return ENXIO;
335 }
336
337
338 err = bus_setup_intr(self, sc->irq_res,
337 err = bus_setup_intr(self, sc->irq_res,
339 INTR_TYPE_NET | INTR_MPSAFE,
340#if FWOHCI_INTFILT
341 fwohci_filt, NULL, sc, &sc->ih);
342#else
343 NULL, (driver_intr_t *) fwohci_intr, sc, &sc->ih);
344#endif
338 INTR_TYPE_NET | INTR_MPSAFE,
339 NULL, (driver_intr_t *) fwohci_intr,
340 sc, &sc->ih);
341
345#if defined(__DragonFly__) || __FreeBSD_version < 500000
346 /* XXX splcam() should mask this irq for sbp.c*/
347 err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_CAM,
348 (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_cam);
349 /* XXX splbio() should mask this irq for physio()/fwmem_strategy() */
350 err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO,
351 (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_bio);
352#endif

--- 207 unchanged lines hidden ---
342#if defined(__DragonFly__) || __FreeBSD_version < 500000
343 /* XXX splcam() should mask this irq for sbp.c*/
344 err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_CAM,
345 (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_cam);
346 /* XXX splbio() should mask this irq for physio()/fwmem_strategy() */
347 err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO,
348 (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_bio);
349#endif

--- 207 unchanged lines hidden ---