Deleted Added
full compact
fwohci_pci.c (159535) fwohci_pci.c (166165)
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 159535 2006-06-12 04:00:33Z imp $
34 * $FreeBSD: head/sys/dev/firewire/fwohci_pci.c 166165 2007-01-21 19:32:51Z marius $
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>

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

352 (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_bio);
353#endif
354 if (err) {
355 device_printf(self, "Could not setup irq, %d\n", err);
356 fwohci_pci_detach(self);
357 return ENXIO;
358 }
359
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>

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

352 (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_bio);
353#endif
354 if (err) {
355 device_printf(self, "Could not setup irq, %d\n", err);
356 fwohci_pci_detach(self);
357 return ENXIO;
358 }
359
360 err = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1,
360 err = bus_dma_tag_create(
361#if defined(__FreeBSD__) && __FreeBSD_version >= 700020
362 /*parent*/bus_get_dma_tag(self),
363#else
364 /*parent*/NULL,
365#endif
366 /*alignment*/1,
361 /*boundary*/0,
362#if BOUNCE_BUFFER_TEST
363 /*lowaddr*/BUS_SPACE_MAXADDR_24BIT,
364#else
365 /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
366#endif
367 /*highaddr*/BUS_SPACE_MAXADDR,
368 /*filter*/NULL, /*filterarg*/NULL,

--- 183 unchanged lines hidden ---
367 /*boundary*/0,
368#if BOUNCE_BUFFER_TEST
369 /*lowaddr*/BUS_SPACE_MAXADDR_24BIT,
370#else
371 /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
372#endif
373 /*highaddr*/BUS_SPACE_MAXADDR,
374 /*filter*/NULL, /*filterarg*/NULL,

--- 183 unchanged lines hidden ---