[src/trunk]: src/sys/arch/arm32 Centralise declaration of memc_base

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

details:   https://anonhg.NetBSD.org/src/rev/3507883515df
branches:  trunk
changeset: 504343:3507883515df
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Tue Feb 27 20:23:11 2001 +0000

description:
Centralise declaration of memc_base

diffstat:

 sys/arch/arm32/iomd/iomd_dma.c           |  5 ++---
 sys/arch/arm32/iomd/iomd_irqhandler.c    |  4 ++--
 sys/arch/arm32/iomd/iomdvar.h            |  6 +++++-
 sys/arch/arm32/podulebus/podulebus.c     |  3 ++-
 sys/arch/arm32/rc7500/rc7500_machdep.c   |  3 ++-
 sys/arch/arm32/riscpc/rpc_machdep.c      |  3 ++-
 sys/arch/arm32/vidc/beep.c               |  5 ++---
 sys/arch/arm32/vidc/console/vidcrender.c |  3 ++-
 sys/arch/arm32/vidc/lmcaudio.c           |  5 +++--
 sys/arch/arm32/vidc/vidcaudio.c          |  5 ++++-
 10 files changed, 26 insertions(+), 16 deletions(-)

diffs (205 lines):

diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/iomd/iomd_dma.c
--- a/sys/arch/arm32/iomd/iomd_dma.c    Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/iomd/iomd_dma.c    Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomd_dma.c,v 1.8 2001/02/27 18:33:26 reinoud Exp $     */
+/*     $NetBSD: iomd_dma.c,v 1.9 2001/02/27 20:23:11 reinoud Exp $     */
 
 /*
  * Copyright (c) 1995 Scott Stevens
@@ -46,10 +46,9 @@
 #include <machine/irqhandler.h>
 #include <machine/pmap.h>
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 #include <arm32/iomd/iomd_dma.h>
 
-extern int *iomd_base;
-
 #ifndef CPU_ARM7500
 static struct dma_ctrl ctrl[6];
 
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/iomd/iomd_irqhandler.c
--- a/sys/arch/arm32/iomd/iomd_irqhandler.c     Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/iomd/iomd_irqhandler.c     Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomd_irqhandler.c,v 1.25 2001/02/27 18:29:36 reinoud Exp $     */
+/*     $NetBSD: iomd_irqhandler.c,v 1.26 2001/02/27 20:23:11 reinoud Exp $     */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -49,6 +49,7 @@
 #include <uvm/uvm_extern.h>
 
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 
 #include <machine/irqhandler.h>
 #include <machine/cpu.h>
@@ -70,7 +71,6 @@
 extern u_int soft_interrupts;  /* Only so we can initialise it */
 
 extern char *_intrnames;
-extern int  *iomd_base;
 
 /* Prototypes */
 
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/iomd/iomdvar.h
--- a/sys/arch/arm32/iomd/iomdvar.h     Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/iomd/iomdvar.h     Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomdvar.h,v 1.1 1997/10/14 10:58:51 mark Exp $ */
+/*     $NetBSD: iomdvar.h,v 1.2 2001/02/27 20:23:11 reinoud Exp $      */
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -116,4 +116,8 @@
        struct clk_attach_args          ia_clk;
 };
 
+/*
+ * IOMD_BASE register variable
+ */
+extern int *iomd_base;
 /* End of iomdvar.h */
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/podulebus/podulebus.c
--- a/sys/arch/arm32/podulebus/podulebus.c      Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/podulebus/podulebus.c      Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.34 2000/06/29 08:53:02 mrg Exp $ */
+/* $NetBSD: podulebus.c,v 1.35 2001/02/27 20:23:13 reinoud Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -57,6 +57,7 @@
 #include <machine/pte.h>
 #include <machine/pmap.h>
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 #include <arm32/podulebus/podulebus.h>
 #include <arm32/podulebus/podules.h>
 #include <arm32/podulebus/podule_data.h>
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/rc7500/rc7500_machdep.c
--- a/sys/arch/arm32/rc7500/rc7500_machdep.c    Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/rc7500/rc7500_machdep.c    Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rc7500_machdep.c,v 1.31 2001/02/25 23:59:49 reinoud Exp $      */
+/*     $NetBSD: rc7500_machdep.c,v 1.32 2001/02/27 20:23:12 reinoud Exp $      */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -76,6 +76,7 @@
 #include <machine/undefined.h>
 #include <machine/rtc.h>
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 
 #include "opt_ipkdb.h"
 
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/riscpc/rpc_machdep.c
--- a/sys/arch/arm32/riscpc/rpc_machdep.c       Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/riscpc/rpc_machdep.c       Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_machdep.c,v 1.41 2001/02/25 23:59:49 reinoud Exp $ */
+/*     $NetBSD: rpc_machdep.c,v 1.42 2001/02/27 20:23:12 reinoud Exp $ */
 
 /*
  * Copyright (c) 2000-2001 Reinoud Zandijk.
@@ -81,6 +81,7 @@
 #include <machine/undefined.h>
 #include <machine/rtc.h>
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 
 #include "opt_ipkdb.h"
 
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/vidc/beep.c
--- a/sys/arch/arm32/vidc/beep.c        Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/vidc/beep.c        Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: beep.c,v 1.22 2001/02/27 19:57:51 reinoud Exp $        */
+/*     $NetBSD: beep.c,v 1.23 2001/02/27 20:23:12 reinoud Exp $        */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe
@@ -63,6 +63,7 @@
 #include <arm/mainbus/mainbus.h>
 #include <arm32/vidc/waveform.h>
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 #ifdef RC7500
 #include <arm32/vidc/lmc1982.h>
 #endif
@@ -70,8 +71,6 @@
 #include "beep.h"
 #include "locators.h"
 
-extern int *iomd_base;
-
 struct beep_softc {
        struct device sc_device;
        irqhandler_t sc_ih;
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/vidc/console/vidcrender.c
--- a/sys/arch/arm32/vidc/console/vidcrender.c  Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/vidc/console/vidcrender.c  Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vidcrender.c,v 1.1 2001/02/21 00:53:36 reinoud Exp $   */
+/*     $NetBSD: vidcrender.c,v 1.2 2001/02/27 20:23:13 reinoud Exp $   */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -70,6 +70,7 @@
 #include <machine/vidc.h>
 #include <machine/vconsole.h>
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 
 #include <arm32/vidc/console/fonts/font_normal.h>
 #include <arm32/vidc/console/fonts/font_bold.h>
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/vidc/lmcaudio.c
--- a/sys/arch/arm32/vidc/lmcaudio.c    Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/vidc/lmcaudio.c    Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lmcaudio.c,v 1.29 2001/02/25 17:17:56 reinoud Exp $    */
+/*     $NetBSD: lmcaudio.c,v 1.30 2001/02/27 20:23:12 reinoud Exp $    */
 
 /*
  * Copyright (c) 1996, Danny C Tsen.
@@ -59,12 +59,13 @@
 #include <machine/katelib.h>
 
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 #include <arm/mainbus/mainbus.h>
 #include <arm32/vidc/waveform.h>
 #include "lmcaudio.h"
 
 #include <arm32/vidc/lmc1982.h>
- 
+
 struct audio_general {
        vm_offset_t silence;
        vm_offset_t beep;
diff -r 5be51ccfbbea -r 3507883515df sys/arch/arm32/vidc/vidcaudio.c
--- a/sys/arch/arm32/vidc/vidcaudio.c   Tue Feb 27 19:57:51 2001 +0000
+++ b/sys/arch/arm32/vidc/vidcaudio.c   Tue Feb 27 20:23:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vidcaudio.c,v 1.35 2001/02/25 17:17:56 reinoud Exp $   */
+/*     $NetBSD: vidcaudio.c,v 1.36 2001/02/27 20:23:12 reinoud Exp $   */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -55,10 +55,13 @@
 #include <machine/katelib.h>
 
 #include <arm32/iomd/iomdreg.h>
+#include <arm32/iomd/iomdvar.h>
 #include <arm/mainbus/mainbus.h>
 #include <arm32/vidc/waveform.h>
 #include "vidcaudio.h"
 
+extern int *vidc_base;
+
 #undef DEBUG
 
 struct audio_general {