- Move the declaration of struct upa_ranges and the UPA_RANGE_* macros

  from sys/sparc64/include/ofw_upa.h to sys/sparc64/pci/ofw_pci.h and
  rename them to struct ofw_pci_ranges and OFW_PCI_RANGE_* respectively.
  This ranges struct only applies to host-PCI bridges but no to other
  bridges found on UPA. At the same time it applies to all host-PCI
  bridges regardless of whether the interconnection bus is Fireplane/
  Safari, JBus or UPA.
- While here rename the PCI_CS_* macros in sys/sparc64/pci/ofw_pci.h
  to OFW_PCI_CS_* in order to be consistent and change this header to
  use uintXX_t instead of u_intXX_t.

2 files changed, 0 insertions, 36 deletions

diff --git a/sys/sparc64/include/ofw_nexus.h b/sys/sparc64/include/ofw_nexus.h
index 959c9d2..fbe6d39 100644
--- a/sys/sparc64/include/ofw_nexus.h
+++ b/sys/sparc64/include/ofw_nexus.h
@@ -46,27 +46,9 @@ struct upa_regs {
 	u_int32_t	size_lo;
 };
 
-struct upa_ranges {
-	u_int32_t	cspace;
-	u_int32_t	child_hi;
-	u_int32_t	child_lo;
-	u_int32_t	phys_hi;
-	u_int32_t	phys_lo;
-	u_int32_t	size_hi;
-	u_int32_t	size_lo;
-};
-
 #define	UPA_REG_PHYS(r) \
 	(((u_int64_t)(r)->phys_hi << 32) | (u_int64_t)(r)->phys_lo)
 #define	UPA_REG_SIZE(r) \
 	(((u_int64_t)(r)->size_hi << 32) | (u_int64_t)(r)->size_lo)
 
-#define	UPA_RANGE_CHILD(r) \
-	(((u_int64_t)(r)->child_hi << 32) | (u_int64_t)(r)->child_lo)
-#define	UPA_RANGE_PHYS(r) \
-	(((u_int64_t)(r)->phys_hi << 32) | (u_int64_t)(r)->phys_lo)
-#define	UPA_RANGE_SIZE(r) \
-	(((u_int64_t)(r)->size_hi << 32) | (u_int64_t)(r)->size_lo)
-#define	UPA_RANGE_CS(r)		(((r)->cspace >> 24) & 0x03)
-
 #endif /* !_MACHINE_OFW_UPA_H_ */
diff --git a/sys/sparc64/include/ofw_upa.h b/sys/sparc64/include/ofw_upa.h
index 959c9d2..fbe6d39 100644
--- a/sys/sparc64/include/ofw_upa.h
+++ b/sys/sparc64/include/ofw_upa.h
@@ -46,27 +46,9 @@ struct upa_regs {
 	u_int32_t	size_lo;
 };
 
-struct upa_ranges {
-	u_int32_t	cspace;
-	u_int32_t	child_hi;
-	u_int32_t	child_lo;
-	u_int32_t	phys_hi;
-	u_int32_t	phys_lo;
-	u_int32_t	size_hi;
-	u_int32_t	size_lo;
-};
-
 #define	UPA_REG_PHYS(r) \
 	(((u_int64_t)(r)->phys_hi << 32) | (u_int64_t)(r)->phys_lo)
 #define	UPA_REG_SIZE(r) \
 	(((u_int64_t)(r)->size_hi << 32) | (u_int64_t)(r)->size_lo)
 
-#define	UPA_RANGE_CHILD(r) \
-	(((u_int64_t)(r)->child_hi << 32) | (u_int64_t)(r)->child_lo)
-#define	UPA_RANGE_PHYS(r) \
-	(((u_int64_t)(r)->phys_hi << 32) | (u_int64_t)(r)->phys_lo)
-#define	UPA_RANGE_SIZE(r) \
-	(((u_int64_t)(r)->size_hi << 32) | (u_int64_t)(r)->size_lo)
-#define	UPA_RANGE_CS(r)		(((r)->cspace >> 24) & 0x03)
-
 #endif /* !_MACHINE_OFW_UPA_H_ */