Module Name: src
Committed By: cliff
Date: Mon Nov 9 10:05:50 UTC 2009
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obiovar.h
Log Message:
- convert to CFATTACH_DECL_NEW & related
- add bus_dma tags
- removed unused fields: sc_pci_dmat, rmixl_bus_mbst, rmixl_bus_mdt
- add PCI bus_space addrs and tags
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_obiovar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_obiovar.h
diff -u src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.3 src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.4
--- src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.3 Tue Sep 15 02:32:02 2009
+++ src/sys/arch/mips/rmi/rmixl_obiovar.h Mon Nov 9 10:05:50 2009
@@ -1,9 +1,10 @@
-/* $NetBSD: rmixl_obiovar.h,v 1.1.2.3 2009/09/15 02:32:02 cliff Exp $ */
+/* $NetBSD: rmixl_obiovar.h,v 1.1.2.4 2009/11/09 10:05:50 cliff Exp $ */
#ifndef _MIPS_RMIXL_OBIOVAR_H_
#define _MIPS_RMIXL_OBIOVAR_H_
#include <dev/pci/pcivar.h>
+#include <mips/bus_dma.h>
#include <mips/pci_machdep.h>
struct obio_attach_args {
@@ -13,28 +14,20 @@
bus_size_t obio_size;
int obio_intr;
unsigned int obio_mult;
- bus_dma_tag_t obio_dmat;
+ bus_dma_tag_t obio_29bit_dmat;
+ bus_dma_tag_t obio_32bit_dmat;
+ bus_dma_tag_t obio_64bit_dmat;
};
typedef struct obio_softc {
- struct device sc_dev;
+ device_t sc_dev;
bus_space_tag_t sc_el_bst;
bus_space_tag_t sc_eb_bst;
- bus_dma_tag_t sc_lt4G_dmat;
- bus_dma_tag_t sc_ge4G_dmat;
+ bus_dma_tag_t sc_29bit_dmat;
+ bus_dma_tag_t sc_32bit_dmat;
+ bus_dma_tag_t sc_64bit_dmat;
bus_addr_t sc_base;
bus_size_t sc_size;
-
- /* Bus space, DMA, and PCI tags for the PCI bus. */
- bus_space_handle_t sc_pcicfg_ioh;
-#ifdef NOTYET
- struct XXX_bus_dma_tag sc_pci_dmat;
- struct XXX_pci_chipset sc_pci_chipset;
-#endif
} obio_softc_t;
-extern struct mips_bus_space rmixl_bus_mbst;
-extern struct mips_bus_dma_tag rmixl_bus_mdt;
-
-
#endif /* _MIPS_OMAP_RMIXL_OBIOVAR_H_ */
