diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-08-04 23:17:41 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-08-04 23:17:41 +0000 |
| commit | a8bfdf187d480013f5e12f12d5c1e2bd6b94b66b (patch) | |
| tree | 5f6878efca3a98a6075669637d5a21fed2cc0732 | |
| parent | 070ccb5661af2ffbaf170bade753f8ad47a8e77d (diff) | |
Match bus_dma api with NetBSD; deprecate BUS_DMAMEM_NOSYNC, introduce
BUS_DMA_COHERENT as a hint instead, currently ignored.
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/include/bus.h | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index ed920d23fc4..388eacf7dc2 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.109 1999/07/06 07:59:54 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.110 1999/08/04 23:17:40 niklas Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2702,12 +2702,6 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags) panic("_bus_dmamem_map: size botch"); pmap_enter(pmap_kernel(), va, addr, VM_PROT_READ | VM_PROT_WRITE, TRUE); -#if 0 - if (flags & BUS_DMAMEM_NOSYNC) - pmap_changebit(addr, PG_N, ~0); - else - pmap_changebit(addr, 0, ~PG_N); -#endif } } diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h index 73d65be45d7..219ce0a26fe 100644 --- a/sys/arch/i386/include/bus.h +++ b/sys/arch/i386/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.15 1999/03/09 15:39:07 mickey Exp $ */ +/* $OpenBSD: bus.h,v 1.16 1999/08/04 23:17:40 niklas Exp $ */ /* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */ /*- @@ -802,7 +802,7 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ #define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMAMEM_NOSYNC 0x04 /* map memory to not require sync */ +#define BUS_DMA_COHERENT 0x04 /* hint: map memory DMA coherent */ #define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ #define BUS_DMA_BUS2 0x20 #define BUS_DMA_BUS3 0x40 |