[src/trunk]: src/sys/arch/amiga Eliminate commons. (including a few unused o...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86d4f34f6302
branches:  trunk
changeset: 526916:86d4f34f6302
user:      matt <matt%NetBSD.org@localhost>
date:      Tue May 14 00:08:21 2002 +0000

description:
Eliminate commons.  (including a few unused or mismatched ones).

diffstat:

 sys/arch/amiga/amiga/drcustom.h |  10 +++++-----
 sys/arch/amiga/amiga/machdep.c  |  12 ++++++++++--
 sys/arch/amiga/dev/clock.c      |   6 ++++--
 sys/arch/amiga/dev/grf_cl.c     |  12 ++++++------
 sys/arch/amiga/dev/rtc.h        |   6 +++---
 sys/arch/amiga/dev/sbicvar.h    |   4 ++--
 sys/arch/amiga/dev/siopvar.h    |   4 ++--
 7 files changed, 32 insertions(+), 22 deletions(-)

diffs (196 lines):

diff -r 453767d53038 -r 86d4f34f6302 sys/arch/amiga/amiga/drcustom.h
--- a/sys/arch/amiga/amiga/drcustom.h   Tue May 14 00:05:56 2002 +0000
+++ b/sys/arch/amiga/amiga/drcustom.h   Tue May 14 00:08:21 2002 +0000
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: drcustom.h,v 1.6 2002/04/25 09:20:28 aymeric Exp $
+ * $NetBSD: drcustom.h,v 1.7 2002/05/14 00:08:21 matt Exp $
  *
  * Motherboard addresses for the DraCo.
  *
@@ -53,11 +53,11 @@
 #ifdef _KERNEL
 #ifndef _LOCORE
 
-vaddr_t DRCCADDR;
+extern vaddr_t DRCCADDR;
 
-volatile u_int8_t *draco_intena, *draco_intpen, *draco_intfrc;
-volatile u_int8_t *draco_misc;
-volatile struct drioct *draco_ioct;
+extern volatile u_int8_t *draco_intena, *draco_intpen, *draco_intfrc;
+extern volatile u_int8_t *draco_misc;
+extern volatile struct drioct *draco_ioct;
 
 struct drioct {
        u_int8_t dum0;
diff -r 453767d53038 -r 86d4f34f6302 sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c    Tue May 14 00:05:56 2002 +0000
+++ b/sys/arch/amiga/amiga/machdep.c    Tue May 14 00:08:21 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.171 2002/04/25 09:20:28 aymeric Exp $    */
+/*     $NetBSD: machdep.c,v 1.172 2002/05/14 00:08:21 matt Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -46,7 +46,7 @@
 #include "opt_compat_netbsd.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.171 2002/04/25 09:20:28 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.172 2002/05/14 00:08:21 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -173,6 +173,14 @@
  */
 int    ser_open_speed;
 
+#ifdef DRACO
+vaddr_t DRCCADDR;
+
+volatile u_int8_t *draco_intena, *draco_intpen, *draco_intfrc;
+volatile u_int8_t *draco_misc;
+volatile struct drioct *draco_ioct;
+#endif
+
  /*
  * Console initialization: called early on from main,
  * before vm init or startup.  Do enough configuration
diff -r 453767d53038 -r 86d4f34f6302 sys/arch/amiga/dev/clock.c
--- a/sys/arch/amiga/dev/clock.c        Tue May 14 00:05:56 2002 +0000
+++ b/sys/arch/amiga/dev/clock.c        Tue May 14 00:08:21 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.38 2002/01/28 09:56:53 aymeric Exp $ */
+/*     $NetBSD: clock.c,v 1.39 2002/05/14 00:08:21 matt Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.38 2002/01/28 09:56:53 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.39 2002/05/14 00:08:21 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -72,6 +72,8 @@
 int amiga_clk_interval;
 int eclockfreq;
 struct CIA *clockcia;
+int (*usettod)(struct timeval *);
+int (*ugettod)(struct timeval *);
 
 /*
  * Machine-dependent clock routines.
diff -r 453767d53038 -r 86d4f34f6302 sys/arch/amiga/dev/grf_cl.c
--- a/sys/arch/amiga/dev/grf_cl.c       Tue May 14 00:05:56 2002 +0000
+++ b/sys/arch/amiga/dev/grf_cl.c       Tue May 14 00:08:21 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cl.c,v 1.29 2002/03/17 19:40:28 atatat Exp $ */
+/*     $NetBSD: grf_cl.c,v 1.30 2002/05/14 00:08:21 matt Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.29 2002/03/17 19:40:28 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.30 2002/05/14 00:08:21 matt Exp $");
 
 #include "grfcl.h"
 #if NGRFCL > 0
@@ -160,7 +160,7 @@
 
 int    cltype = 0;             /* Picasso, Spectrum or Piccolo */
 int    cl_64bit = 0;           /* PiccoloSD64 or PicassoIV */
-unsigned char pass_toggle;     /* passthru status tracker */
+unsigned char cl_pass_toggle;  /* passthru status tracker */
 
 /*
  * because all 542x-boards have 2 configdev entries, one for
@@ -1216,7 +1216,7 @@
 
        ba = gp->g_regkva;
 
-       if (pass_toggle) {
+       if (cl_pass_toggle) {
                RegOffpass(ba);
        } else {
                RegOnpass(ba);
@@ -1802,7 +1802,7 @@
                        vgaw(ba, PASS_ADDRESS_W, vgar(ba, PASS_ADDRESS) & 0xdf);
                break;
        }
-       pass_toggle = 1;
+       cl_pass_toggle = 1;
        delay(200000);
 }
 
@@ -1826,7 +1826,7 @@
                        vgaw(ba, PASS_ADDRESS_W, vgar(ba, PASS_ADDRESS) | 0x20);
                break;
        }
-       pass_toggle = 0;
+       cl_pass_toggle = 0;
        delay(200000);
 }
 
diff -r 453767d53038 -r 86d4f34f6302 sys/arch/amiga/dev/rtc.h
--- a/sys/arch/amiga/dev/rtc.h  Tue May 14 00:05:56 2002 +0000
+++ b/sys/arch/amiga/dev/rtc.h  Tue May 14 00:08:21 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtc.h,v 1.8 2002/01/26 13:40:59 aymeric Exp $  */
+/*     $NetBSD: rtc.h,v 1.9 2002/05/14 00:08:22 matt Exp $     */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -38,8 +38,8 @@
 /* this is a hook set by a clock driver for the configured realtime clock,
    returning plain current unix-time */
 
-int (*ugettod)(struct timeval *);
-int (*usettod)(struct timeval *);
+extern int (*ugettod)(struct timeval *);
+extern int (*usettod)(struct timeval *);
 
 struct rtclock2000 {
        u_int  :28, second2:4;  /* lower digit */
diff -r 453767d53038 -r 86d4f34f6302 sys/arch/amiga/dev/sbicvar.h
--- a/sys/arch/amiga/dev/sbicvar.h      Tue May 14 00:05:56 2002 +0000
+++ b/sys/arch/amiga/dev/sbicvar.h      Tue May 14 00:08:21 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbicvar.h,v 1.17 2002/01/26 13:41:00 aymeric Exp $     */
+/*     $NetBSD: sbicvar.h,v 1.18 2002/05/14 00:08:22 matt Exp $        */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -99,7 +99,7 @@
        u_char  flags;
        u_char  period;         /* Period suggestion */
        u_char  offset;         /* Offset suggestion */
-} tinfo_t;
+};
 
 struct sbic_softc {
        struct  device sc_dev;
diff -r 453767d53038 -r 86d4f34f6302 sys/arch/amiga/dev/siopvar.h
--- a/sys/arch/amiga/dev/siopvar.h      Tue May 14 00:05:56 2002 +0000
+++ b/sys/arch/amiga/dev/siopvar.h      Tue May 14 00:08:21 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siopvar.h,v 1.20 2002/01/26 13:41:00 aymeric Exp $     */
+/*     $NetBSD: siopvar.h,v 1.21 2002/05/14 00:08:22 matt Exp $        */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -117,7 +117,7 @@
        u_char  flags;
        u_char  period;         /* Period suggestion */
        u_char  offset;         /* Offset suggestion */
-} tinfo_t;
+};
 
 struct siop_softc {
        struct  device sc_dev;