summaryrefslogtreecommitdiff
path: root/sys/arch/i386/isa
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-12-03 15:46:08 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-12-03 15:46:08 +0000
commiteed4923e178ed7783b0dac916688e40dce6372cb (patch)
tree7763d5d2b02b9bbb4e82cd54fdc2d9052c4d6cfc /sys/arch/i386/isa
parente5cb898edd1b10cebb2a4a4531325af2b64c6114 (diff)
Remove the x86 and i386 prefixes to the bus_dma types. It's really quite
pointless and just makes the code different for no reason. This moves i386 and amd64 bus_dma to being a lot closer to identical. suggestion to just remove the prefix instead of merge them from deraadt@. no objections art@, kettenis@, ok weingart@
Diffstat (limited to 'sys/arch/i386/isa')
-rw-r--r--sys/arch/i386/isa/isa_machdep.c6
-rw-r--r--sys/arch/i386/isa/isa_machdep.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index aef54b79227..75ee160842b 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.63 2008/06/26 05:42:11 ray Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.64 2008/12/03 15:46:06 oga Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
/*-
@@ -83,7 +83,7 @@
#include <machine/mpbiosvar.h>
#endif
-#define _I386_BUS_DMA_PRIVATE
+#define _BUS_DMA_PRIVATE
#include <machine/bus.h>
#include <machine/intr.h>
@@ -145,7 +145,7 @@ void _isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
* the generic functions that understand how to deal with bounce
* buffers, if necessary.
*/
-struct i386_bus_dma_tag isa_bus_dma_tag = {
+struct bus_dma_tag isa_bus_dma_tag = {
NULL, /* _cookie */
_isa_bus_dmamap_create,
_isa_bus_dmamap_destroy,
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 0706775654a..7da886a15d6 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.22 2008/06/26 05:42:11 ray Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.23 2008/12/03 15:46:07 oga Exp $ */
/* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */
/*-
@@ -112,7 +112,7 @@ void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
* BY PORTABLE CODE.
*/
-extern struct i386_bus_dma_tag isa_bus_dma_tag;
+extern struct bus_dma_tag isa_bus_dma_tag;
/*
* Cookie used by ISA dma. A pointer to one of these it stashed in