[src/trunk]: src/sys/arch/acorn32 Use <machine/intr.h>, not <machine/irqhandl...

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

details:   https://anonhg.NetBSD.org/src/rev/76ab52dfbb52
branches:  trunk
changeset: 518263:76ab52dfbb52
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Nov 27 00:53:11 2001 +0000

description:
Use <machine/intr.h>, not <machine/irqhandler.h>

diffstat:

 sys/arch/acorn32/acorn32/autoconf.c     |  4 ++--
 sys/arch/acorn32/acorn32/rpc_machdep.c  |  4 ++--
 sys/arch/acorn32/mainbus/com_pioc.c     |  4 ++--
 sys/arch/acorn32/mainbus/fd.c           |  4 ++--
 sys/arch/acorn32/mainbus/lpt_pioc.c     |  4 ++--
 sys/arch/acorn32/mainbus/wdc_pioc.c     |  4 ++--
 sys/arch/acorn32/podulebus/amps.c       |  4 ++--
 sys/arch/acorn32/podulebus/asc.c        |  4 ++--
 sys/arch/acorn32/podulebus/cosc.c       |  4 ++--
 sys/arch/acorn32/podulebus/csa.c        |  4 ++--
 sys/arch/acorn32/podulebus/csc.c        |  4 ++--
 sys/arch/acorn32/podulebus/esc.c        |  4 ++--
 sys/arch/acorn32/podulebus/icside.c     |  4 ++--
 sys/arch/acorn32/podulebus/if_ie.c      |  4 ++--
 sys/arch/acorn32/podulebus/if_ne_pbus.c |  4 ++--
 sys/arch/acorn32/podulebus/netslot.c    |  6 +++---
 sys/arch/acorn32/podulebus/podulebus.c  |  4 ++--
 sys/arch/acorn32/podulebus/ptsc.c       |  4 ++--
 sys/arch/acorn32/podulebus/rapide.c     |  4 ++--
 sys/arch/acorn32/podulebus/sfas.c       |  4 ++--
 sys/arch/acorn32/podulebus/simide.c     |  4 ++--
 21 files changed, 43 insertions(+), 43 deletions(-)

diffs (truncated from 387 to 300 lines):

diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/acorn32/autoconf.c
--- a/sys/arch/acorn32/acorn32/autoconf.c       Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/acorn32/autoconf.c       Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.1 2001/10/05 22:27:46 reinoud Exp $     */
+/*     $NetBSD: autoconf.c,v 1.2 2001/11/27 00:53:11 thorpej Exp $     */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -53,7 +53,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <machine/bootconfig.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 
 
 #include "podulebus.h"
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c    Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c    Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_machdep.c,v 1.7 2001/11/23 21:18:29 thorpej Exp $  */
+/*     $NetBSD: rpc_machdep.c,v 1.8 2001/11/27 00:53:11 thorpej Exp $  */
 
 /*
  * Copyright (c) 2000-2001 Reinoud Zandijk.
@@ -76,7 +76,7 @@
 #include <machine/bootconfig.h>
 #include <machine/cpu.h>
 #include <machine/io.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <arm/arm32/katelib.h>
 #include <machine/vconsole.h>
 #include <arm/undefined.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/mainbus/com_pioc.c
--- a/sys/arch/acorn32/mainbus/com_pioc.c       Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/mainbus/com_pioc.c       Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_pioc.c,v 1.1 2001/10/05 22:27:53 reinoud Exp $     */
+/*     $NetBSD: com_pioc.c,v 1.2 2001/11/27 00:53:11 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/bus.h>
 #include <machine/io.h>
 
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c     Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c     Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.2 2001/11/22 18:34:33 thorpej Exp $   */
+/*     $NetBSD: fd.c,v 1.3 2001/11/27 00:53:11 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/conf.h>
 #include <machine/io.h>
 #include <arm/arm32/katelib.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/mainbus/lpt_pioc.c
--- a/sys/arch/acorn32/mainbus/lpt_pioc.c       Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/mainbus/lpt_pioc.c       Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lpt_pioc.c,v 1.1 2001/10/05 22:27:53 reinoud Exp $     */
+/*     $NetBSD: lpt_pioc.c,v 1.2 2001/11/27 00:53:11 thorpej Exp $     */
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
@@ -39,7 +39,7 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <machine/bus.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <acorn32/mainbus/piocvar.h>
 #include <dev/ic/lptreg.h>
 #include <dev/ic/lptvar.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/mainbus/wdc_pioc.c
--- a/sys/arch/acorn32/mainbus/wdc_pioc.c       Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/mainbus/wdc_pioc.c       Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_pioc.c,v 1.1 2001/10/05 22:27:54 reinoud Exp $     */
+/*     $NetBSD: wdc_pioc.c,v 1.2 2001/11/27 00:53:11 thorpej Exp $     */
 
 /*
  * Copyright (c) 1997-1998 Mark Brinicombe.
@@ -39,7 +39,7 @@
 #include <sys/malloc.h>
 
 #include <machine/bus.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 
 #include <acorn32/mainbus/piocvar.h>
 
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/amps.c
--- a/sys/arch/acorn32/podulebus/amps.c Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/amps.c Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amps.c,v 1.1 2001/10/05 22:27:54 reinoud Exp $ */
+/*     $NetBSD: amps.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
 #include <sys/types.h>
 #include <sys/device.h>
 
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/io.h>
 #include <machine/bus.h>
 #include <acorn32/podulebus/podulebus.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/asc.c
--- a/sys/arch/acorn32/podulebus/asc.c  Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/asc.c  Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asc.c,v 1.2 2001/11/22 18:34:33 thorpej Exp $  */
+/*     $NetBSD: asc.c,v 1.3 2001/11/27 00:53:12 thorpej Exp $  */
 
 /*
  * Copyright (c) 2001 Richard Earnshaw
@@ -82,7 +82,7 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/bootconfig.h>                /* asc_poll */
 
 #include <dev/scsipi/scsi_all.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/cosc.c
--- a/sys/arch/acorn32/podulebus/cosc.c Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/cosc.c Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cosc.c,v 1.2 2001/11/22 18:34:33 thorpej Exp $ */
+/*     $NetBSD: cosc.c,v 1.3 2001/11/27 00:53:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -50,7 +50,7 @@
 #include <dev/scsipi/scsiconf.h>
 #include <machine/bootconfig.h>
 #include <machine/io.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <arm/arm32/katelib.h>
 #include <acorn32/podulebus/podulebus.h>
 #include <acorn32/podulebus/escreg.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/csa.c
--- a/sys/arch/acorn32/podulebus/csa.c  Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/csa.c  Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: csa.c,v 1.1 2001/10/05 22:27:55 reinoud Exp $  */
+/*     $NetBSD: csa.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $  */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
 #include <dev/ic/ncr5380var.h>
 
 #include <machine/io.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/bootconfig.h>
 
 #include <acorn32/podulebus/podulebus.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/csc.c
--- a/sys/arch/acorn32/podulebus/csc.c  Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/csc.c  Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: csc.c,v 1.1 2001/10/05 22:27:55 reinoud Exp $  */
+/*     $NetBSD: csc.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
 #include <uvm/uvm_extern.h>
 #include <machine/pmap.h>
 #include <machine/io.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/bootconfig.h>
 #include <acorn32/podulebus/podulebus.h>
 #include <acorn32/podulebus/sfasreg.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/esc.c
--- a/sys/arch/acorn32/podulebus/esc.c  Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/esc.c  Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esc.c,v 1.2 2001/11/22 18:34:33 thorpej Exp $  */
+/*     $NetBSD: esc.c,v 1.3 2001/11/27 00:53:12 thorpej Exp $  */
 
 /*
  * Copyright (c) 1995 Scott Stevens
@@ -67,7 +67,7 @@
 #include <machine/pmap.h>
 #include <machine/cpu.h>
 #include <machine/io.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <arm/arm32/katelib.h>
 #include <acorn32/podulebus/podulebus.h>
 #include <acorn32/podulebus/escreg.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/icside.c
--- a/sys/arch/acorn32/podulebus/icside.c       Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/icside.c       Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icside.c,v 1.1 2001/10/05 22:27:55 reinoud Exp $       */
+/*     $NetBSD: icside.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $       */
 
 /*
  * Copyright (c) 1997-1998 Mark Brinicombe
@@ -46,7 +46,7 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/io.h>
 #include <machine/bus.h>
 #include <acorn32/podulebus/podulebus.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c        Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c        Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.2 2001/11/22 18:34:33 thorpej Exp $ */
+/* $NetBSD: if_ie.c,v 1.3 2001/11/27 00:53:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -66,7 +66,7 @@
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <machine/io.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <arm/arm32/katelib.h>
 #include <acorn32/podulebus/podulebus.h>
 #include <dev/podulebus/podules.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/if_ne_pbus.c
--- a/sys/arch/acorn32/podulebus/if_ne_pbus.c   Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/if_ne_pbus.c   Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ne_pbus.c,v 1.1 2001/10/05 22:27:56 reinoud Exp $   */
+/*     $NetBSD: if_ne_pbus.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $   */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 #include <net/if_media.h>
 
 #include <machine/bus.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/io.h>
 #include <dev/ic/dp8390reg.h>
 #include <dev/ic/dp8390var.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/netslot.c
--- a/sys/arch/acorn32/podulebus/netslot.c      Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/netslot.c      Tue Nov 27 00:53:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netslot.c,v 1.3 2001/11/23 17:23:41 thorpej Exp $      */
+/*     $NetBSD: netslot.c,v 1.4 2001/11/27 00:53:12 thorpej Exp $      */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -35,7 +35,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(1, "$Id: netslot.c,v 1.3 2001/11/23 17:23:41 thorpej Exp $");
+__KERNEL_RCSID(1, "$Id: netslot.c,v 1.4 2001/11/27 00:53:12 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -45,7 +45,7 @@
 #include <uvm/uvm_extern.h>
 #include <machine/io.h>
 #include <arm/arm32/katelib.h>
-#include <machine/irqhandler.h>
+#include <machine/intr.h>
 #include <machine/bootconfig.h>
 #include <machine/pmap.h>
 #include <arm/iomd/iomdreg.h>
diff -r f01bbe788e8d -r 76ab52dfbb52 sys/arch/acorn32/podulebus/podulebus.c
--- a/sys/arch/acorn32/podulebus/podulebus.c    Tue Nov 27 00:50:46 2001 +0000
+++ b/sys/arch/acorn32/podulebus/podulebus.c    Tue Nov 27 00:53:11 2001 +0000