Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/vax Real-time clock is started on the same way on a...
details: https://anonhg.NetBSD.org/src/rev/7421e4de3d17
branches: trunk
changeset: 472544:7421e4de3d17
user: ragge <ragge%NetBSD.org@localhost>
date: Sat May 01 16:13:43 1999 +0000
description:
Real-time clock is started on the same way on all CPUs, there is no
need for a special CPU-dependent hook for this.
diffstat:
sys/arch/vax/include/cpu.h | 3 +--
sys/arch/vax/vax/clock.c | 22 +++++-----------------
sys/arch/vax/vax/ka410.c | 3 +--
sys/arch/vax/vax/ka43.c | 3 +--
sys/arch/vax/vax/ka46.c | 3 +--
sys/arch/vax/vax/ka48.c | 1 -
sys/arch/vax/vax/ka630.c | 3 +--
sys/arch/vax/vax/ka650.c | 3 +--
sys/arch/vax/vax/ka750.c | 3 +--
sys/arch/vax/vax/ka780.c | 3 +--
sys/arch/vax/vax/ka820.c | 3 +--
sys/arch/vax/vax/ka860.c | 3 +--
sys/arch/vax/vax/machdep.c | 8 +-------
13 files changed, 16 insertions(+), 45 deletions(-)
diffs (246 lines):
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/include/cpu.h
--- a/sys/arch/vax/include/cpu.h Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/include/cpu.h Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.35 1999/04/17 00:01:18 ragge Exp $ */
+/* $NetBSD: cpu.h,v 1.36 1999/05/01 16:13:43 ragge Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -50,7 +50,6 @@
*/
struct cpu_dep {
void (*cpu_steal_pages) __P((void)); /* pmap init before mm is on */
- void (*cpu_clock) __P((void)); /* CPU dep RT clock start */
int (*cpu_mchk) __P((caddr_t)); /* Machine check handling */
void (*cpu_memerr) __P((void)); /* Memory subsystem errors */
/* Autoconfiguration */
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/clock.c
--- a/sys/arch/vax/vax/clock.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/clock.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.27 1999/03/26 22:04:07 ragge Exp $ */
+/* $NetBSD: clock.c,v 1.28 1999/05/01 16:13:43 ragge Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -153,29 +153,17 @@
asm ("1: sobgtr %0, 1b" : : "r" (dep_call->cpu_vups * i));
}
-#if VAX750 || VAX780 || VAX8200 || VAX8600 || VAX8800 || VAX48 || VAX49
/*
- * On most VAXen there are a microsecond clock that should
- * be used for interval interrupts. Have a generic version here.
+ * On all VAXen there are a microsecond clock that should
+ * be used for interval interrupts. Some CPUs don't use the ICR interval
+ * register but it doesn't hurt to load it anyway.
*/
void
-generic_clock()
+cpu_initclocks()
{
mtpr(-10000, PR_NICR); /* Load in count register */
mtpr(0x800000d1, PR_ICCS); /* Start clock and enable interrupt */
}
-#endif
-
-#if VAX650 || VAX630 || VAX410 || VAX43 || VAX46
-/*
- * Most microvaxen don't have a interval count register.
- */
-void
-no_nicr_clock()
-{
- mtpr(0x800000d1, PR_ICCS); /* Start clock and enable interrupt */
-}
-#endif
/*
* There are two types of real-time battery-backed up clocks on
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka410.c
--- a/sys/arch/vax/vax/ka410.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka410.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka410.c,v 1.18 1999/04/14 23:14:46 ragge Exp $ */
+/* $NetBSD: ka410.c,v 1.19 1999/05/01 16:13:44 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -71,7 +71,6 @@
*/
struct cpu_dep ka410_calls = {
0,
- no_nicr_clock,
ka410_mchk,
ka410_memerr,
ka410_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka43.c
--- a/sys/arch/vax/vax/ka43.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka43.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka43.c,v 1.16 1999/04/14 23:14:46 ragge Exp $ */
+/* $NetBSD: ka43.c,v 1.17 1999/05/01 16:13:44 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -72,7 +72,6 @@
struct cpu_dep ka43_calls = {
ka43_steal_pages,
- no_nicr_clock,
ka43_mchk,
ka43_memerr,
ka43_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka46.c
--- a/sys/arch/vax/vax/ka46.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka46.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka46.c,v 1.7 1999/04/14 23:14:46 ragge Exp $ */
+/* $NetBSD: ka46.c,v 1.8 1999/05/01 16:13:44 ragge Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -70,7 +70,6 @@
*/
struct cpu_dep ka46_calls = {
ka46_steal_pages,
- no_nicr_clock,
ka46_mchk,
ka46_memerr,
ka46_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka48.c
--- a/sys/arch/vax/vax/ka48.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka48.c Sat May 01 16:13:43 1999 +0000
@@ -71,7 +71,6 @@
*/
struct cpu_dep ka48_calls = {
ka48_steal_pages,
- generic_clock,
ka48_mchk,
ka48_memerr,
ka48_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka630.c
--- a/sys/arch/vax/vax/ka630.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka630.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka630.c,v 1.14 1999/02/02 18:37:21 ragge Exp $ */
+/* $NetBSD: ka630.c,v 1.15 1999/05/01 16:13:44 ragge Exp $ */
/*-
* Copyright (c) 1982, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -63,7 +63,6 @@
struct cpu_dep ka630_calls = {
0,
- no_nicr_clock,
ka630_mchk,
ka630_memerr,
ka630_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka650.c
--- a/sys/arch/vax/vax/ka650.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka650.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka650.c,v 1.18 1999/04/19 14:50:57 ragge Exp $ */
+/* $NetBSD: ka650.c,v 1.19 1999/05/01 16:13:44 ragge Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -71,7 +71,6 @@
struct cpu_dep ka650_calls = {
0, /* No special page stealing anymore */
- no_nicr_clock,
uvaxIII_mchk,
uvaxIII_memerr,
uvaxIII_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka750.c
--- a/sys/arch/vax/vax/ka750.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka750.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka750.c,v 1.27 1999/02/02 18:37:21 ragge Exp $ */
+/* $NetBSD: ka750.c,v 1.28 1999/05/01 16:13:44 ragge Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -64,7 +64,6 @@
struct cpu_dep ka750_calls = {
0,
- generic_clock,
ka750_mchk,
ka750_memerr,
ka750_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka780.c
--- a/sys/arch/vax/vax/ka780.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka780.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka780.c,v 1.12 1999/02/02 18:37:21 ragge Exp $ */
+/* $NetBSD: ka780.c,v 1.13 1999/05/01 16:13:44 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -67,7 +67,6 @@
*/
struct cpu_dep ka780_calls = {
0,
- generic_clock,
ka780_mchk,
ka780_memerr,
ka780_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka820.c
--- a/sys/arch/vax/vax/ka820.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka820.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka820.c,v 1.14 1999/02/02 18:37:21 ragge Exp $ */
+/* $NetBSD: ka820.c,v 1.15 1999/05/01 16:13:45 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,7 +75,6 @@
struct cpu_dep ka820_calls = {
0,
- generic_clock,
ka820_mchk,
ka820_memerr,
NULL,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/ka860.c
--- a/sys/arch/vax/vax/ka860.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/ka860.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ka860.c,v 1.13 1999/02/02 18:37:21 ragge Exp $ */
+/* $NetBSD: ka860.c,v 1.14 1999/05/01 16:13:45 ragge Exp $ */
/*
* Copyright (c) 1986, 1988 Regents of the University of California.
* All rights reserved.
@@ -64,7 +64,6 @@
struct cpu_dep ka860_calls = {
0,
- generic_clock,
ka86_mchk,
ka86_memerr,
ka86_conf,
diff -r d2959a891ec0 -r 7421e4de3d17 sys/arch/vax/vax/machdep.c
--- a/sys/arch/vax/vax/machdep.c Sat May 01 14:18:35 1999 +0000
+++ b/sys/arch/vax/vax/machdep.c Sat May 01 16:13:43 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.80 1999/04/25 02:56:29 simonb Exp $ */
+/* $NetBSD: machdep.c,v 1.81 1999/05/01 16:13:45 ragge Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -398,12 +398,6 @@
dumplo = btodb(CLBYTES);
}
-void
-cpu_initclocks()
-{
- (*dep_call->cpu_clock) ();
-}
-
int
cpu_sysctl(a, b, c, d, e, f, g)
int *a;
Home |
Main Index |
Thread Index |
Old Index