Module Name: src
Committed By: cliff
Date: Wed Apr 7 19:24:13 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixlvar.h
Log Message:
- bus space related fields renamed to reflect use by both pcie and pcix
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/sys/arch/mips/rmi/rmixlvar.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/rmixlvar.h
diff -u src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.16 src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.17
--- src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.16 Mon Mar 29 23:31:38 2010
+++ src/sys/arch/mips/rmi/rmixlvar.h Wed Apr 7 19:24:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixlvar.h,v 1.1.2.16 2010/03/29 23:31:38 cliff Exp $ */
+/* $NetBSD: rmixlvar.h,v 1.1.2.17 2010/04/07 19:24:13 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -110,18 +110,18 @@
struct rmixl_config {
uint64_t rc_io_pbase;
- bus_addr_t rc_pcie_cfg_pbase;
- bus_size_t rc_pcie_cfg_size;
- bus_addr_t rc_pcie_ecfg_pbase;
- bus_size_t rc_pcie_ecfg_size;
+ bus_addr_t rc_pci_cfg_pbase;
+ bus_size_t rc_pci_cfg_size;
+ bus_addr_t rc_pci_ecfg_pbase;
+ bus_size_t rc_pci_ecfg_size;
bus_addr_t rc_pci_mem_pbase;
bus_size_t rc_pci_mem_size;
bus_addr_t rc_pci_io_pbase;
bus_size_t rc_pci_io_size;
struct mips_bus_space rc_obio_eb_memt; /* DEVIO -eb */
struct mips_bus_space rc_obio_el_memt; /* DEVIO -el */
- struct mips_bus_space rc_pcie_cfg_memt; /* PCI CFG */
- struct mips_bus_space rc_pcie_ecfg_memt; /* PCI ECFG */
+ struct mips_bus_space rc_pci_cfg_memt; /* PCI CFG */
+ struct mips_bus_space rc_pci_ecfg_memt; /* PCI ECFG */
struct mips_bus_space rc_pci_memt; /* PCI MEM */
struct mips_bus_space rc_pci_iot; /* PCI IO */
struct mips_bus_dma_tag rc_64bit_dmat;
@@ -130,10 +130,10 @@
struct extent *rc_phys_ex; /* Note: MB units */
struct extent *rc_obio_eb_ex;
struct extent *rc_obio_el_ex;
- struct extent *rc_pcie_cfg_ex;
- struct extent *rc_pcie_ecfg_ex;
- struct extent *rc_pcie_mem_ex;
- struct extent *rc_pcie_io_ex;
+ struct extent *rc_pci_cfg_ex;
+ struct extent *rc_pci_ecfg_ex;
+ struct extent *rc_pci_mem_ex;
+ struct extent *rc_pci_io_ex;
int rc_mallocsafe;
rmixlfw_info_t rc_psb_info;
rmixlfw_psb_type_t rc_psb_type;
@@ -146,10 +146,10 @@
extern void rmixl_obio_eb_bus_mem_init(bus_space_tag_t, void *);
extern void rmixl_obio_el_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_cfg_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_ecfg_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_bus_io_init(bus_space_tag_t, void *);
+extern void rmixl_pci_cfg_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pci_ecfg_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pci_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pci_bus_io_init(bus_space_tag_t, void *);
extern void rmixl_addr_error_init(void);
extern int rmixl_addr_error_check(void);
