Module Name: src
Committed By: cliff
Date: Wed Apr 7 19:30:11 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie_cfg_space.c
rmixl_pcie_ecfg_space.c rmixl_pcie_io_space.c
rmixl_pcie_mem_space.c
Log Message:
- these bus spaces can be used by pcix or pcie interfaces,
use names changed to reflet that
- also these files will soon be renamed accordingly
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c \
src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c \
src/sys/arch/mips/rmi/rmixl_pcie_io_space.c \
src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c
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_pcie_cfg_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.2 Wed Nov 18 01:16:07 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c Wed Apr 7 19:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,20 +45,20 @@
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
-#define CHIP rmixl_pcie_cfg
+#define CHIP rmixl_pci_cfg
#define CHIP_MEM /* defined */
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
-#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_cfg_ex)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pci_cfg_ex)
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) \
- (((struct rmixl_config *)(v))->rc_pcie_cfg_pbase)
+ (((struct rmixl_config *)(v))->rc_pci_cfg_pbase)
#define CHIP_W1_BUS_END(v) \
(CHIP_W1_SYS_START(v) + \
- (((struct rmixl_config *)(v))->rc_pcie_cfg_size) - 1)
+ (((struct rmixl_config *)(v))->rc_pci_cfg_size) - 1)
#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
Index: src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.2 Wed Nov 18 01:16:07 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c Wed Apr 7 19:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,20 +45,20 @@
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
-#define CHIP rmixl_pcie_ecfg
+#define CHIP rmixl_pci_ecfg
#define CHIP_MEM /* defined */
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
-#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_ecfg_ex)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pci_ecfg_ex)
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) \
- (((struct rmixl_config *)(v))->rc_pcie_ecfg_pbase)
+ (((struct rmixl_config *)(v))->rc_pci_ecfg_pbase)
#define CHIP_W1_BUS_END(v) \
(CHIP_W1_SYS_START(v) + \
- (((struct rmixl_config *)(v))->rc_pcie_ecfg_size) - 1)
+ (((struct rmixl_config *)(v))->rc_pci_ecfg_size) - 1)
#define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v)
#define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v)
Index: src/sys/arch/mips/rmi/rmixl_pcie_io_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.2 Wed Nov 18 01:16:07 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_io_space.c Wed Apr 7 19:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_io_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_io_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,13 +45,13 @@
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
-#define CHIP rmixl_pcie
+#define CHIP rmixl_pci
#define CHIP_IO /* defined */
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
-#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_io_ex)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pci_io_ex)
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) (((struct rmixl_config *)(v))->rc_pci_io_pbase)
Index: src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c:1.1.2.2 Wed Nov 18 01:16:07 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie_mem_space.c Wed Apr 7 19:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */
+/* $NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie_mem_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -45,13 +45,13 @@
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
-#define CHIP rmixl_pcie
+#define CHIP rmixl_pci
#define CHIP_MEM /* defined */
#define CHIP_ACCESS_SIZE 1
#define CHIP_LITTLE_ENDIAN
#define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))->rc_mallocsafe)
-#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pcie_mem_ex)
+#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))->rc_pci_mem_ex)
/* MEM region 1 */
#define CHIP_W1_BUS_START(v) (((struct rmixl_config *)(v))->rc_pci_mem_pbase)
