diff options
| author | simokawa <simokawa@FreeBSD.org> | 2004-03-26 23:17:10 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2004-03-26 23:17:10 +0000 |
| commit | 3e9f33ddfa8ae2d049f8e827244fdb7ee5f13790 (patch) | |
| tree | d9df20a1b244e854f2dbc94fb002b9471a60e817 /sys/dev/firewire/fwdma.c | |
| parent | d5e8f62700d6cc71bdc98dcce5c75443c6b4a22b (diff) | |
| download | FreeBSD-src-3e9f33ddfa8ae2d049f8e827244fdb7ee5f13790.zip FreeBSD-src-3e9f33ddfa8ae2d049f8e827244fdb7ee5f13790.tar.gz | |
MFp4: FireWire
* all
- s/__FUNCTION__/__func__/.
Submitted by: Stefan Farfeleder <stefan@fafoe.narf.at>
- Compatibility for RELENG_4 and DragonFly.
* firewire
- Timestamp just before queuing.
- Retry bus probe if it fails.
- Use device_printf() for debug message.
- Invalidiate CROM while update.
- Don't process minimum/invalid CROM.
* sbp
- Add ORB_SHORTAGE flag.
- Add sbp.tags tunable.
- Revive doorbell support. It's not enabled by default.
Diffstat (limited to 'sys/dev/firewire/fwdma.c')
| -rw-r--r-- | sys/dev/firewire/fwdma.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/dev/firewire/fwdma.c b/sys/dev/firewire/fwdma.c index 95420c0..afb1a09 100644 --- a/sys/dev/firewire/fwdma.c +++ b/sys/dev/firewire/fwdma.c @@ -33,14 +33,17 @@ * */ +#ifdef __FreeBSD__ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> #include <sys/kernel.h> #include <sys/malloc.h> -#if __FreeBSD_version >= 501102 +#if defined(__FreeBSD__) && __FreeBSD_version >= 501102 #include <sys/lock.h> #include <sys/mutex.h> #endif @@ -48,9 +51,15 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/bus.h> +#ifdef __DragonFly__ +#include <bus/firewire/firewire.h> +#include <bus/firewire/firewirereg.h> +#include <bus/firewire/fwdma.h> +#else #include <dev/firewire/firewire.h> #include <dev/firewire/firewirereg.h> #include <dev/firewire/fwdma.h> +#endif static void fwdma_map_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) @@ -81,7 +90,7 @@ fwdma_malloc(struct firewire_comm *fc, int alignment, bus_size_t size, /*nsegments*/ 1, /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, /*flags*/ BUS_DMA_ALLOCNOW, -#if __FreeBSD_version >= 501102 +#if defined(__FreeBSD__) && __FreeBSD_version >= 501102 /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, #endif @@ -179,7 +188,7 @@ fwdma_malloc_multiseg(struct firewire_comm *fc, int alignment, /*nsegments*/ 1, /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, /*flags*/ BUS_DMA_ALLOCNOW, -#if __FreeBSD_version >= 501102 +#if defined(__FreeBSD__) && __FreeBSD_version >= 501102 /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, #endif @@ -190,7 +199,7 @@ fwdma_malloc_multiseg(struct firewire_comm *fc, int alignment, } #if 0 -#if __FreeBSD_version < 500000 +#if defined(__DragonFly__) || __FreeBSD_version < 500000 printf("malloc_multi: ssize=%d nseg=%d\n", ssize, nseg); #else printf("malloc_multi: ssize=%td nseg=%d\n", ssize, nseg); |
