diff options
Diffstat (limited to 'sys/arch/amd64/include')
| -rw-r--r-- | sys/arch/amd64/include/bus.h | 18 | ||||
| -rw-r--r-- | sys/arch/amd64/include/isa_machdep.h | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/include/pci_machdep.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/amd64/include/bus.h b/sys/arch/amd64/include/bus.h index 88e13b20fd9..f51456236d1 100644 --- a/sys/arch/amd64/include/bus.h +++ b/sys/arch/amd64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.12 2008/11/22 17:45:20 oga Exp $ */ +/* $OpenBSD: bus.h,v 1.13 2008/12/03 15:46:06 oga Exp $ */ /* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */ /*- @@ -459,8 +459,8 @@ struct uio; #define BUS_DMASYNC_PREWRITE 0x04 #define BUS_DMASYNC_POSTWRITE 0x08 -typedef struct x86_bus_dma_tag *bus_dma_tag_t; -typedef struct x86_bus_dmamap *bus_dmamap_t; +typedef struct bus_dma_tag *bus_dma_tag_t; +typedef struct bus_dmamap *bus_dmamap_t; /* * bus_dma_segment_t @@ -468,11 +468,11 @@ typedef struct x86_bus_dmamap *bus_dmamap_t; * Describes a single contiguous DMA transaction. Values * are suitable for programming into DMA registers. */ -struct x86_bus_dma_segment { +struct bus_dma_segment { bus_addr_t ds_addr; /* DMA address */ bus_size_t ds_len; /* length of transfer */ }; -typedef struct x86_bus_dma_segment bus_dma_segment_t; +typedef struct bus_dma_segment bus_dma_segment_t; /* * bus_dma_tag_t @@ -481,7 +481,7 @@ typedef struct x86_bus_dma_segment bus_dma_segment_t; * DMA for a given bus. */ -struct x86_bus_dma_tag { +struct bus_dma_tag { void *_cookie; /* cookie used in the guts */ /* @@ -550,7 +550,7 @@ struct x86_bus_dma_tag { * * Describes a DMA mapping. */ -struct x86_bus_dmamap { +struct bus_dmamap { /* * PRIVATE MEMBERS: not for use by machine-independent code. */ @@ -570,7 +570,7 @@ struct x86_bus_dmamap { bus_dma_segment_t dm_segs[1]; /* segments; variable length */ }; -#ifdef _X86_BUS_DMA_PRIVATE +#ifdef _BUS_DMA_PRIVATE int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, bus_size_t, int, bus_dmamap_t *); void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); @@ -613,6 +613,6 @@ int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size, paddr_t bus_space_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); -#endif /* _X86_BUS_DMA_PRIVATE */ +#endif /* _BUS_DMA_PRIVATE */ #endif /* _X86_BUS_H_ */ diff --git a/sys/arch/amd64/include/isa_machdep.h b/sys/arch/amd64/include/isa_machdep.h index 37c41d67069..81c0f4d187a 100644 --- a/sys/arch/amd64/include/isa_machdep.h +++ b/sys/arch/amd64/include/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.7 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.8 2008/12/03 15:46:06 oga Exp $ */ /* $NetBSD: isa_machdep.h,v 1.2 2003/05/09 23:51:28 fvdl Exp $ */ /*- @@ -124,7 +124,7 @@ void isa_reinit_irq(void); * BY PORTABLE CODE. */ -extern struct x86_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 diff --git a/sys/arch/amd64/include/pci_machdep.h b/sys/arch/amd64/include/pci_machdep.h index bc4f75c3ca9..60c95d80b23 100644 --- a/sys/arch/amd64/include/pci_machdep.h +++ b/sys/arch/amd64/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.5 2008/11/26 12:27:31 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.6 2008/12/03 15:46:06 oga Exp $ */ /* $NetBSD: pci_machdep.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */ /* @@ -55,7 +55,7 @@ union x86_pci_tag_u { } mode2; }; -extern struct x86_bus_dma_tag pci_bus_dma_tag; +extern struct bus_dma_tag pci_bus_dma_tag; /* * Types provided to machine-independent PCI code |