Module Name: src
Committed By: cliff
Date: Sun Nov 15 22:58:15 UTC 2009
Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obiovar.h
Added Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio_space.c
Removed Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_eb_space.c
rmixl_el_space.c
Log Message:
- we don't need -el bus space for obio, get rid of it and clean up the naming
- delete rmixl_eb_space.c, rmixl_el_space.c
- add mixl_obio_space.c, provides -eb bus space for obio devices
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/conf/files.rmixl
cvs rdiff -u -r1.1.2.1 -r0 src/sys/arch/mips/rmi/rmixl_eb_space.c \
src/sys/arch/mips/rmi/rmixl_el_space.c
cvs rdiff -u -r0 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_obio_space.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_obiovar.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/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.5 src/sys/arch/mips/conf/files.rmixl:1.1.2.6
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.5 Sat Nov 14 21:59:15 2009
+++ src/sys/arch/mips/conf/files.rmixl Sun Nov 15 22:58:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.1.2.5 2009/11/14 21:59:15 cliff Exp $
+# $NetBSD: files.rmixl,v 1.1.2.6 2009/11/15 22:58:15 cliff Exp $
#
# Configuration info for RMI XLP, XLR, XLS
#
@@ -11,8 +11,9 @@
device obio: obio
attach obio at mainbus
file arch/mips/rmi/rmixl_obio.c obio needs-count
-file arch/mips/rmi/rmixl_el_space.c obio
-file arch/mips/rmi/rmixl_eb_space.c obio
+file arch/mips/rmi/rmixl_obio_space.c obio
+file arch/mips/rmi/rmixl_pcie_cfg_space.c pci
+file arch/mips/rmi/rmixl_pcie_ecfg_space.c pci
file arch/mips/rmi/rmixl_pcie_io_space.c pci
file arch/mips/rmi/rmixl_pcie_mem_space.c pci
Index: src/sys/arch/mips/rmi/rmixl_obiovar.h
diff -u src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.5 src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_obiovar.h:1.1.2.5 Fri Nov 13 05:26:42 2009
+++ src/sys/arch/mips/rmi/rmixl_obiovar.h Sun Nov 15 22:58:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obiovar.h,v 1.1.2.5 2009/11/13 05:26:42 cliff Exp $ */
+/* $NetBSD: rmixl_obiovar.h,v 1.1.2.6 2009/11/15 22:58:15 cliff Exp $ */
#ifndef _MIPS_RMI_RMIXL_OBIOVAR_H_
#define _MIPS_RMI_RMIXL_OBIOVAR_H_
@@ -8,8 +8,7 @@
#include <mips/pci_machdep.h>
struct obio_attach_args {
- bus_space_tag_t obio_el_bst;
- bus_space_tag_t obio_eb_bst;
+ bus_space_tag_t obio_bst;
bus_addr_t obio_addr;
bus_size_t obio_size;
int obio_intr;
@@ -21,8 +20,7 @@
typedef struct obio_softc {
device_t sc_dev;
- bus_space_tag_t sc_el_bst;
- bus_space_tag_t sc_eb_bst;
+ bus_space_tag_t sc_bst;
bus_dma_tag_t sc_29bit_dmat;
bus_dma_tag_t sc_32bit_dmat;
bus_dma_tag_t sc_64bit_dmat;
Added files:
Index: src/sys/arch/mips/rmi/rmixl_obio_space.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_obio_space.c:1.1.2.4
--- /dev/null Sun Nov 15 22:58:16 2009
+++ src/sys/arch/mips/rmi/rmixl_obio_space.c Sun Nov 15 22:58:15 2009
@@ -0,0 +1,58 @@
+/* $NetBSD: rmixl_obio_space.c,v 1.1.2.4 2009/11/15 22:58:15 cliff Exp $ */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Big Endian bus_space(9) support for RMI {XLP,XLR,XLS} chips
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio_space.c,v 1.1.2.4 2009/11/15 22:58:15 cliff Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+
+#include <machine/bus.h>
+#include <mips/rmi/rmixl_obiovar.h>
+#include <mips/rmi/rmixlreg.h>
+#include <mips/rmi/rmixlvar.h>
+
+#define CHIP rmixl_obio
+#define CHIP_MEM /* defined */
+#define CHIP_ACCESS_SIZE 4
+#define CHIP_BIG_ENDIAN
+
+/* MEM region 1 */
+#define CHIP_W1_BUS_START(v) 0
+#define CHIP_W1_BUS_END(v) (RMIXL_IO_DEV_SIZE - 1)
+#define CHIP_W1_SYS_START(v) (((struct rmixl_config *)(v))->rc_io_pbase)
+#define CHIP_W1_SYS_END(v) (CHIP_W1_SYS_START(v) + RMIXL_IO_DEV_SIZE - 1)
+
+#include <mips/mips/bus_space_alignstride_chipdep.c>
