From fe8a330be50ed8aa08412497a02c6cf144e2f712 Mon Sep 17 00:00:00 2001 From: ragge Date: Mon, 6 Sep 1999 19:52:52 +0000 Subject: [PATCH] Styr upp deklarationen av clockchippsparametrarna. --- sys/arch/vax/include/clock.h | 4 ++-- sys/arch/vax/vax/ka410.c | 5 +---- sys/arch/vax/vax/ka43.c | 6 +----- sys/arch/vax/vax/ka46.c | 5 +---- sys/arch/vax/vax/ka48.c | 3 --- sys/arch/vax/vax/ka630.c | 6 +----- sys/arch/vax/vax/ka820.c | 4 +--- 7 files changed, 7 insertions(+), 26 deletions(-) diff --git a/sys/arch/vax/include/clock.h b/sys/arch/vax/include/clock.h index f16679fcfd55..ee7881e94481 100644 --- a/sys/arch/vax/include/clock.h +++ b/sys/arch/vax/include/clock.h @@ -1,4 +1,4 @@ -/* $NetBSD: clock.h,v 1.3 1999/08/30 21:18:17 ragge Exp $ */ +/* $NetBSD: clock.h,v 1.4 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -65,7 +65,7 @@ #define CSRD_VRT 0200 /* Var's used when dealing with clock chip */ -extern short *clk_page; +extern volatile short *clk_page; extern int clk_adrshift, clk_tweak; /* Prototypes */ diff --git a/sys/arch/vax/vax/ka410.c b/sys/arch/vax/vax/ka410.c index a30129bfb288..07e530829fe2 100644 --- a/sys/arch/vax/vax/ka410.c +++ b/sys/arch/vax/vax/ka410.c @@ -1,4 +1,4 @@ -/* $NetBSD: ka410.c,v 1.20 1999/08/07 10:36:48 ragge Exp $ */ +/* $NetBSD: ka410.c,v 1.21 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -64,8 +64,6 @@ static void ka410_clrf __P((void)); static caddr_t l2cache; /* mapped in address */ static long *cacr; /* l2csche ctlr reg */ -extern short *clk_page; - /* * Declaration of 410-specific calls. */ @@ -87,7 +85,6 @@ struct cpu_dep ka410_calls = { void ka410_conf() { - extern int clk_adrshift, clk_tweak; struct vs_cpu *ka410_cpu; ka410_cpu = (struct vs_cpu *)vax_map_physmem(VS_REGS, 1); diff --git a/sys/arch/vax/vax/ka43.c b/sys/arch/vax/vax/ka43.c index 2d2cd2fdf8a6..5df2e592b41f 100644 --- a/sys/arch/vax/vax/ka43.c +++ b/sys/arch/vax/vax/ka43.c @@ -1,4 +1,4 @@ -/* $NetBSD: ka43.c,v 1.18 1999/08/07 10:36:48 ragge Exp $ */ +/* $NetBSD: ka43.c,v 1.19 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -90,8 +90,6 @@ struct cpu_dep ka43_calls = { * but before leving ka43_steal_pages() we reset them to virtual addresses. */ static volatile struct ka43_cpu *ka43_cpu = (void*)KA43_CPU_BASE; -extern short *clk_page; - static volatile u_int *ka43_creg = (void*)KA43_CH2_CREG; static volatile u_int *ka43_ctag = (void*)KA43_CT2_BASE; @@ -303,8 +301,6 @@ ka43_cache_enable() void ka43_conf() { - extern int clk_adrshift, clk_tweak; - printf("cpu: KA43\n"); ka43_cpu = (void *)vax_map_physmem(VS_REGS, 1); diff --git a/sys/arch/vax/vax/ka46.c b/sys/arch/vax/vax/ka46.c index bd387419eacc..28cf6f19c47e 100644 --- a/sys/arch/vax/vax/ka46.c +++ b/sys/arch/vax/vax/ka46.c @@ -1,4 +1,4 @@ -/* $NetBSD: ka46.c,v 1.9 1999/08/07 10:36:48 ragge Exp $ */ +/* $NetBSD: ka46.c,v 1.10 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -63,7 +63,6 @@ static void ka46_reboot __P((int)); static void ka46_cache_enable __P((void)); struct vs_cpu *ka46_cpu; -extern short *clk_page; /* * Declaration of 46-specific calls. @@ -85,8 +84,6 @@ struct cpu_dep ka46_calls = { void ka46_conf() { - extern int clk_adrshift, clk_tweak; - printf("cpu: KA46\n"); ka46_cpu = (void *)vax_map_physmem(VS_REGS, 1); printf("cpu: turning on floating point chip\n"); diff --git a/sys/arch/vax/vax/ka48.c b/sys/arch/vax/vax/ka48.c index 80870f8d6a4e..5be61e561f0e 100644 --- a/sys/arch/vax/vax/ka48.c +++ b/sys/arch/vax/vax/ka48.c @@ -64,7 +64,6 @@ static void ka48_reboot __P((int)); static void ka48_cache_enable __P((void)); struct vs_cpu *ka48_cpu; -extern short *clk_page; /* * Declaration of 48-specific calls. @@ -86,8 +85,6 @@ struct cpu_dep ka48_calls = { void ka48_conf() { - extern int clk_adrshift, clk_tweak; - printf("cpu: KA48\n"); ka48_cpu = (void *)vax_map_physmem(VS_REGS, 1); printf("cpu: turning on floating point chip\n"); diff --git a/sys/arch/vax/vax/ka630.c b/sys/arch/vax/vax/ka630.c index 3649e630002f..a6e4d29eb22d 100644 --- a/sys/arch/vax/vax/ka630.c +++ b/sys/arch/vax/vax/ka630.c @@ -1,4 +1,4 @@ -/* $NetBSD: ka630.c,v 1.16 1999/08/07 10:36:48 ragge Exp $ */ +/* $NetBSD: ka630.c,v 1.17 1999/09/06 19:52:52 ragge Exp $ */ /*- * Copyright (c) 1982, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -59,8 +59,6 @@ static void ka630_halt __P((void)); static void ka630_reboot __P((int)); static void ka630_clrf __P((void)); -extern short *clk_page; - struct cpu_dep ka630_calls = { 0, ka630_mchk, @@ -81,8 +79,6 @@ struct cpu_dep ka630_calls = { void ka630_conf() { - extern int clk_adrshift, clk_tweak; - clk_adrshift = 0; /* Addressed at short's... */ clk_tweak = 0; /* ...and no shifting */ clk_page = (short *)vax_map_physmem((paddr_t)KA630CLK, 1); diff --git a/sys/arch/vax/vax/ka820.c b/sys/arch/vax/vax/ka820.c index c85df7d0bab2..55d11c0efaa6 100644 --- a/sys/arch/vax/vax/ka820.c +++ b/sys/arch/vax/vax/ka820.c @@ -1,4 +1,4 @@ -/* $NetBSD: ka820.c,v 1.16 1999/08/04 19:11:01 ragge Exp $ */ +/* $NetBSD: ka820.c,v 1.17 1999/09/06 19:52:52 ragge Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -125,8 +125,6 @@ ka820_attach(parent, self, aux) { struct bi_attach_args *ba = aux; register int csr; - extern short *clk_page; - extern int clk_adrshift, clk_tweak; u_short rev; extern char cpu_model[];