From 704bf01027dd307ad9abf31d54a41bb3ed74bbf3 Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Sat, 4 Feb 2012 19:54:13 +0000 Subject: Unify OF PCI infrastructure, including changing from parsing the device tree based on heuristics to parsing it based on the spec. This should also lay the foundation for NEW_PCIB on PowerPC. MFC after: 3 months --- sys/powerpc/powermac/uninorthvar.h | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'sys/powerpc/powermac/uninorthvar.h') diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h index 2c37d77..43aa01d 100644 --- a/sys/powerpc/powermac/uninorthvar.h +++ b/sys/powerpc/powermac/uninorthvar.h @@ -28,41 +28,12 @@ #ifndef _POWERPC_POWERMAC_UNINORTHVAR_H_ #define _POWERPC_POWERMAC_UNINORTHVAR_H_ -struct uninorth_range { - u_int32_t pci_hi; - u_int32_t pci_mid; - u_int32_t pci_lo; - u_int32_t host; - u_int32_t size_hi; - u_int32_t size_lo; -}; - -struct uninorth_range64 { - u_int32_t pci_hi; - u_int32_t pci_mid; - u_int32_t pci_lo; - u_int32_t host_hi; - u_int32_t host_lo; - u_int32_t size_hi; - u_int32_t size_lo; -}; +#include struct uninorth_softc { - device_t sc_dev; - phandle_t sc_node; + struct ofw_pci_softc pci_sc; vm_offset_t sc_addr; vm_offset_t sc_data; - int sc_bus; - struct uninorth_range sc_range[7]; - int sc_nrange; - int sc_iostart; - struct rman sc_io_rman; - struct rman sc_mem_rman; - bus_space_tag_t sc_iot; - bus_space_tag_t sc_memt; - bus_dma_tag_t sc_dmat; - struct ofw_bus_iinfo sc_pci_iinfo; - int sc_ver; }; -- cgit v1.1