diff options
| author |   mickey <mickey@openbsd.org> | 2006-04-27 15:17:07 +0000 |
|---|---|---|
| committer | mickey <mickey@openbsd.org> | 2006-04-27 15:17:07 +0000 |
| commit | ecc650db3f73d225259c771fb8ebbf291dce6986 (patch) | |
| tree | 100b2cfc7351bcb1c3dbb0982455cf2a594223d1 | |
| parent | new sentence, new line; (diff) | |
| download | wireguard-openbsd-ecc650db3f73d225259c771fb8ebbf291dce6986.tar.xz wireguard-openbsd-ecc650db3f73d225259c771fb8ebbf291dce6986.zip | |
from PAE work:
add a BUS_DMA_24BIT flag to signify that dmamap being created
is for the isadma use (thus already backed up by the bounce
buffers). later also to be used for dmamem allocation.
| -rw-r--r-- | sys/arch/alpha/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/dev/isa/isadma.c | 5 |
4 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h index c18f5f16afc..e42d3037850 100644 --- a/sys/arch/alpha/include/bus.h +++ b/sys/arch/alpha/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.22 2006/04/04 21:20:40 brad Exp $ */ +/* $OpenBSD: bus.h,v 1.23 2006/04/27 15:17:07 mickey Exp $ */ /* $NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $ */ /* @@ -432,7 +432,7 @@ struct alpha_bus_space { #define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */ #define BUS_DMA_BUS2 0x020 #define BUS_DMA_BUS3 0x040 -#define BUS_DMA_BUS4 0x080 +#define BUS_DMA_24BIT 0x080 /* isadma map */ #define BUS_DMA_STREAMING 0x100 /* hint: sequential, unidirectional */ #define BUS_DMA_READ 0x200 /* mapping is device -> memory only */ #define BUS_DMA_WRITE 0x400 /* mapping is memory -> device only */ diff --git a/sys/arch/amd64/include/bus.h b/sys/arch/amd64/include/bus.h index 6b91fb62fc5..8a8e79b6447 100644 --- a/sys/arch/amd64/include/bus.h +++ b/sys/arch/amd64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.4 2005/11/05 18:29:24 marco Exp $ */ +/* $OpenBSD: bus.h,v 1.5 2006/04/27 15:17:12 mickey Exp $ */ /* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */ /*- @@ -963,7 +963,7 @@ bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh, #define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */ #define BUS_DMA_BUS2 0x020 #define BUS_DMA_BUS3 0x040 -#define BUS_DMA_BUS4 0x080 +#define BUS_DMA_24BIT 0x080 /* isadma map */ #define BUS_DMA_STREAMING 0x100 /* hint: sequential, unidirectional */ #define BUS_DMA_READ 0x200 /* mapping is device -> memory only */ #define BUS_DMA_WRITE 0x400 /* mapping is memory -> device only */ diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h index 279615144c2..0b26d524f49 100644 --- a/sys/arch/i386/include/bus.h +++ b/sys/arch/i386/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.37 2005/05/25 18:29:58 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.38 2006/04/27 15:17:16 mickey Exp $ */ /* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */ /*- @@ -742,7 +742,7 @@ void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, #define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */ #define BUS_DMA_BUS2 0x020 #define BUS_DMA_BUS3 0x040 -#define BUS_DMA_BUS4 0x080 +#define BUS_DMA_24BIT 0x080 /* isadma map */ #define BUS_DMA_STREAMING 0x100 /* hint: sequential, unidirectional */ #define BUS_DMA_READ 0x200 /* mapping is device -> memory only */ #define BUS_DMA_WRITE 0x400 /* mapping is memory -> device only */ diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index 6c372b26ef1..b33de81258b 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.29 2005/11/23 10:00:12 mpf Exp $ */ +/* $OpenBSD: isadma.c,v 1.30 2006/04/27 15:17:19 mickey Exp $ */ /* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */ /*- @@ -128,7 +128,8 @@ isadmaattach(parent, self, aux) for (i = 0; i < 8; i++) { sz = (i & 4) ? 1 << 17 : 1 << 16; if ((bus_dmamap_create(sc->sc_dmat, sz, 1, sz, sz, - BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, &isadma_dmam[i])) != 0) + BUS_DMA_24BIT|BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, + &isadma_dmam[i])) != 0) panic("isadmaattach: can not create DMA map"); } #endif |