diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-12-03 15:46:08 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-12-03 15:46:08 +0000 |
| commit | eed4923e178ed7783b0dac916688e40dce6372cb (patch) | |
| tree | 7763d5d2b02b9bbb4e82cd54fdc2d9052c4d6cfc /sys/arch/amd64/pci | |
| parent | e5cb898edd1b10cebb2a4a4531325af2b64c6114 (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/amd64/pci')
| -rw-r--r-- | sys/arch/amd64/pci/iommu.c | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/pci/pci_machdep.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/pci/iommu.c b/sys/arch/amd64/pci/iommu.c index 6858d4203be..1fc6f1828a5 100644 --- a/sys/arch/amd64/pci/iommu.c +++ b/sys/arch/amd64/pci/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.22 2008/04/28 06:17:47 brad Exp $ */ +/* $OpenBSD: iommu.c,v 1.23 2008/12/03 15:46:06 oga Exp $ */ /* * Copyright (c) 2005 Jason L. Wright (jason@thought.net) @@ -38,7 +38,7 @@ #include <uvm/uvm_extern.h> -#define _X86_BUS_DMA_PRIVATE +#define _BUS_DMA_PRIVATE #include <machine/bus.h> #include <machine/pio.h> @@ -151,7 +151,7 @@ void amdgart_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t); paddr_t amdgart_dmamem_mmap(bus_dma_tag_t, bus_dma_segment_t *, int, off_t, int, int); -struct x86_bus_dma_tag amdgart_bus_dma_tag = { +struct bus_dma_tag amdgart_bus_dma_tag = { NULL, /* _may_bounce */ amdgart_dmamap_create, amdgart_dmamap_destroy, diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c index b94f2e5f149..c77f2f8016b 100644 --- a/sys/arch/amd64/pci/pci_machdep.c +++ b/sys/arch/amd64/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.15 2008/11/26 12:27:31 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.16 2008/12/03 15:46:06 oga Exp $ */ /* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */ /*- @@ -83,7 +83,7 @@ #include <uvm/uvm_extern.h> -#define _X86_BUS_DMA_PRIVATE +#define _BUS_DMA_PRIVATE #include <machine/bus.h> #include <machine/pio.h> @@ -155,7 +155,7 @@ struct { * PCI doesn't have any special needs; just use the generic versions * of these functions. */ -struct x86_bus_dma_tag pci_bus_dma_tag = { +struct bus_dma_tag pci_bus_dma_tag = { NULL, /* _may_bounce */ _bus_dmamap_create, _bus_dmamap_destroy, |