- 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.

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/sparc64/isa/ofw_isa.c b/sys/sparc64/isa/ofw_isa.c
index 41ce54812c09..e1d75374aec1 100644
--- a/sys/sparc64/isa/ofw_isa.c
+++ b/sys/sparc64/isa/ofw_isa.c
@@ -57,9 +57,9 @@ ofw_isa_range_restype(struct isa_ranges *range)
 	int ps = ISA_RANGE_PS(range);
 
 	switch (ps) {
-	case PCI_CS_IO:
+	case OFW_PCI_CS_IO:
 		return (SYS_RES_IOPORT);
-	case PCI_CS_MEM32:
+	case OFW_PCI_CS_MEM32:
 		return (SYS_RES_MEMORY);
 	default:
 		panic("ofw_isa_range_restype: illegal space %x", ps);