Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/pmax/pmax - Rename file names;
details: https://anonhg.NetBSD.org/src/rev/19a837c78346
branches: trunk
changeset: 473127:19a837c78346
user: nisimura <nisimura%NetBSD.org@localhost>
date: Fri May 21 01:09:48 1999 +0000
description:
- Rename file names;
dec_3max_subr.c -> memc_3max.c, dec_kn02_subr.c -> memc_3min.c
diffstat:
sys/arch/pmax/pmax/dec_3max.c | 6 +-
sys/arch/pmax/pmax/dec_3max_subr.c | 103 ----------------------------------
sys/arch/pmax/pmax/dec_3max_subr.h | 39 -------------
sys/arch/pmax/pmax/dec_3maxplus.c | 6 +-
sys/arch/pmax/pmax/dec_3min.c | 6 +-
sys/arch/pmax/pmax/dec_kn02_subr.c | 111 -------------------------------------
sys/arch/pmax/pmax/dec_kn02_subr.h | 39 -------------
sys/arch/pmax/pmax/dec_maxine.c | 6 +-
sys/arch/pmax/pmax/memc.h | 41 +++++++++++++
9 files changed, 53 insertions(+), 304 deletions(-)
diffs (truncated from 461 to 300 lines):
diff -r c2c10e4d5fd3 -r 19a837c78346 sys/arch/pmax/pmax/dec_3max.c
--- a/sys/arch/pmax/pmax/dec_3max.c Fri May 21 00:25:48 1999 +0000
+++ b/sys/arch/pmax/pmax/dec_3max.c Fri May 21 01:09:48 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3max.c,v 1.10 1999/04/26 09:23:22 nisimura Exp $ */
+/* $NetBSD: dec_3max.c,v 1.11 1999/05/21 01:09:50 nisimura Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.10 1999/04/26 09:23:22 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.11 1999/05/21 01:09:50 nisimura Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -95,7 +95,7 @@
#include <pmax/pmax/machdep.h> /* XXXjrs replace with vectors */
#include <pmax/pmax/kn02.h>
-#include <pmax/pmax/dec_3max_subr.h>
+#include <pmax/pmax/memc.h>
/*
* forward declarations
diff -r c2c10e4d5fd3 -r 19a837c78346 sys/arch/pmax/pmax/dec_3max_subr.c
--- a/sys/arch/pmax/pmax/dec_3max_subr.c Fri May 21 00:25:48 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/* $NetBSD: dec_3max_subr.c,v 1.6 1999/03/27 03:27:09 mhitch Exp $ */
-
-/*
- * Copyright (c) 1998 Jonathan Stone. All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Jonathan Stone for
- * the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-
-__KERNEL_RCSID(0, "$NetBSD: dec_3max_subr.c,v 1.6 1999/03/27 03:27:09 mhitch Exp $");
-
-#include <sys/types.h>
-#include <sys/systm.h>
-
-#include <machine/locore.h> /* wbflush() */
-
-#include <pmax/pmax/kn02.h> /* error-register defs copied into kn03.h */
-#include <pmax/pmax/dec_3max_subr.h>
-
-/*
- * the 3max and 3maxplus have compatible memory subsystems;
- * we handle them both here.
- */
-
-
-void
-dec_mtasic_err(erradr, errsyn)
- u_int erradr, errsyn;
-{
- u_int physadr;
-
- if (!(erradr & KN02_ERR_VALID))
- return;
- /* extract the physical word address and compensate for pipelining */
- physadr = erradr & KN02_ERR_ADDRESS;
- if (!(erradr & KN02_ERR_WRITE))
- physadr = (physadr & ~0xfff) | ((physadr & 0xfff) - 5);
- physadr <<= 2;
- printf("%s memory %s %s error at 0x%08x\n",
- (erradr & KN02_ERR_CPU) ? "CPU" : "DMA",
- (erradr & KN02_ERR_WRITE) ? "write" : "read",
- (erradr & KN02_ERR_ECCERR) ? "ECC" : "timeout",
- physadr);
- if (erradr & KN02_ERR_ECCERR) {
- u_int errsyn_value = *(u_int *)errsyn;
- *(u_int *)errsyn = 0;
- wbflush();
- printf(" ECC 0x%08x\n", errsyn_value);
-
- /* check for a corrected, single bit, read error */
- if (!(erradr & KN02_ERR_WRITE)) {
- if (physadr & 0x4) {
- /* check high word */
- if (errsyn_value & KN02_ECC_SNGHI)
- return;
- } else {
- /* check low word */
- if (errsyn_value & KN02_ECC_SNGLO)
- return;
- }
- }
- printf("\n");
- }
- else
- printf("\n");
- panic("panic(\"Mem error interrupt\");\n");
-}
-
-/*
- * Xxx noncontig memory probing with mixed-sized memory boards
- * XXX on 3max (kn02) or 3maxplus (kn03) belongs here.
- */
-
-/*
- * Xxx any support for NVRAM (PrestoServe) modules in
- * XXX on 3max (kn02) or 3maxplus (kn03) memory slots probably belongs here,
- * since we need to not probe it as normal RAM.
- */
diff -r c2c10e4d5fd3 -r 19a837c78346 sys/arch/pmax/pmax/dec_3max_subr.h
--- a/sys/arch/pmax/pmax/dec_3max_subr.h Fri May 21 00:25:48 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/* $NetBSD: dec_3max_subr.h,v 1.2 1999/03/25 01:17:52 simonb Exp $ */
-
-/*
- * Copyright (c) 1998 Jonathan Stone. All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Jonathan Stone for
- * the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-/*
- * the 3max and 3maxplus have compatible memory subsystems;
- * we handle them both here.
- * used on both
- */
-
-void dec_mtasic_err __P((u_int erradr, u_int errsyn));
diff -r c2c10e4d5fd3 -r 19a837c78346 sys/arch/pmax/pmax/dec_3maxplus.c
--- a/sys/arch/pmax/pmax/dec_3maxplus.c Fri May 21 00:25:48 1999 +0000
+++ b/sys/arch/pmax/pmax/dec_3maxplus.c Fri May 21 01:09:48 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.16 1999/04/26 09:23:23 nisimura Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.17 1999/05/21 01:09:49 nisimura Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.16 1999/04/26 09:23:23 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.17 1999/05/21 01:09:49 nisimura Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@
#include <pmax/pmax/machdep.h> /* XXXjrs replace with vectors */
#include <pmax/pmax/kn03.h>
-#include <pmax/pmax/dec_3max_subr.h>
+#include <pmax/pmax/memc.h>
/*
* Forward declarations
diff -r c2c10e4d5fd3 -r 19a837c78346 sys/arch/pmax/pmax/dec_3min.c
--- a/sys/arch/pmax/pmax/dec_3min.c Fri May 21 00:25:48 1999 +0000
+++ b/sys/arch/pmax/pmax/dec_3min.c Fri May 21 01:09:48 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.14 1999/04/26 09:23:23 nisimura Exp $ */
+/* $NetBSD: dec_3min.c,v 1.15 1999/05/21 01:09:50 nisimura Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.14 1999/04/26 09:23:23 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.15 1999/05/21 01:09:50 nisimura Exp $");
#include <sys/types.h>
@@ -102,7 +102,7 @@
#include <pmax/pmax/machdep.h> /* XXXjrs replace with vectors */
#include <pmax/pmax/kmin.h> /* 3min baseboard addresses */
-#include <pmax/pmax/dec_kn02_subr.h> /* 3min/maxine memory errors */
+#include <pmax/pmax/memc.h> /* 3min/maxine memory errors */
/*
diff -r c2c10e4d5fd3 -r 19a837c78346 sys/arch/pmax/pmax/dec_kn02_subr.c
--- a/sys/arch/pmax/pmax/dec_kn02_subr.c Fri May 21 00:25:48 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/* $NetBSD: dec_kn02_subr.c,v 1.3 1999/04/24 08:01:12 simonb Exp $ */
-
-/*
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department and Ralph Campbell.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- * from: Utah Hdr: trap.c 1.32 91/04/06
- *
- * @(#)trap.c 8.5 (Berkeley) 1/11/94
- */
-
-
-#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-
-__KERNEL_RCSID(0, "$NetBSD: dec_kn02_subr.c,v 1.3 1999/04/24 08:01:12 simonb Exp $");
-
-/*
- * Motherboard memory error contoller used in both
- * 3min (kn02ba) and maxine (kn02ca).
- */
-
-#include <sys/types.h>
-#include <sys/systm.h>
-
-#include <mips/cpuregs.h>
-
-#include <pmax/pmax/kmin.h>
-#include <pmax/pmax/dec_kn02_subr.h>
-
-
-/* forward declarations */
-static unsigned kn02ba_recover_erradr __P((u_int phys, u_int mer));
Home |
Main Index |
Thread Index |
Old Index