diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-12-11 17:07:15 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-12-11 17:07:15 +0000 |
| commit | a8eb0a9fc0b98b7b3415d1ca5352651e9ed778fa (patch) | |
| tree | 7413babb4111de04de4c319c894b5a5c32e6feac /sys/arch/amd64/isa | |
| parent | 7505ac789440ab79520a3193eb85316c416adfc9 (diff) | |
Kill the $ARCH prefix for isa_dma_cookie. With this change, the i386 and
amd64 isa dma code is identical save for some formatting, and a slight
difference in bus_dmamem_alloc.
"Die x86_!" krw@.
Diffstat (limited to 'sys/arch/amd64/isa')
| -rw-r--r-- | sys/arch/amd64/isa/isa_machdep.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/amd64/isa/isa_machdep.c b/sys/arch/amd64/isa/isa_machdep.c index d16f1444007..2861959eb62 100644 --- a/sys/arch/amd64/isa/isa_machdep.c +++ b/sys/arch/amd64/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.18 2008/12/10 20:26:56 oga Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.19 2008/12/11 17:07:14 oga Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -386,7 +386,7 @@ int _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp) { - struct x86_isa_dma_cookie *cookie; + struct isa_dma_cookie *cookie; bus_dmamap_t map; int error, cookieflags; void *cookiestore; @@ -401,7 +401,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, map = *dmamp; map->_dm_cookie = NULL; - cookiesize = sizeof(struct x86_isa_dma_cookie); + cookiesize = sizeof(struct isa_dma_cookie); /* * ISA only has 24-bits of address space. This means @@ -442,7 +442,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, error = ENOMEM; goto out; } - cookie = (struct x86_isa_dma_cookie *)cookiestore; + cookie = (struct isa_dma_cookie *)cookiestore; cookie->id_flags = cookieflags; map->_dm_cookie = cookie; @@ -472,7 +472,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, void _isa_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map) { - struct x86_isa_dma_cookie *cookie = map->_dm_cookie; + struct isa_dma_cookie *cookie = map->_dm_cookie; /* * Free any bounce pages this map might hold. @@ -491,7 +491,7 @@ int _isa_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags) { - struct x86_isa_dma_cookie *cookie = map->_dm_cookie; + struct isa_dma_cookie *cookie = map->_dm_cookie; int error; STAT_INCR(isa_dma_stats_loads); @@ -591,7 +591,7 @@ _isa_bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map, void _isa_bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map) { - struct x86_isa_dma_cookie *cookie = map->_dm_cookie; + struct isa_dma_cookie *cookie = map->_dm_cookie; /* * If we have bounce pages, free them, unless they're @@ -616,7 +616,7 @@ void _isa_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset, bus_size_t len, int op) { - struct x86_isa_dma_cookie *cookie = map->_dm_cookie; + struct isa_dma_cookie *cookie = map->_dm_cookie; #ifdef DEBUG if ((op & (BUS_DMASYNC_PREWRITE|BUS_DMASYNC_POSTREAD)) != 0) { @@ -792,7 +792,7 @@ int _isa_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map, bus_size_t size, int flags) { - struct x86_isa_dma_cookie *cookie = map->_dm_cookie; + struct isa_dma_cookie *cookie = map->_dm_cookie; int error = 0; cookie->id_bouncebuflen = round_page(size); @@ -822,7 +822,7 @@ _isa_dma_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map, bus_size_t size, void _isa_dma_free_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map) { - struct x86_isa_dma_cookie *cookie = map->_dm_cookie; + struct isa_dma_cookie *cookie = map->_dm_cookie; STAT_DECR(isa_dma_stats_nbouncebufs); |