[src/trunk]: src/sys/arch/hp700 Make the interrupt evcnt name consistent ever...

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

details:   https://anonhg.NetBSD.org/src/rev/b220da3920d4
branches:  trunk
changeset: 759307:b220da3920d4
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Dec 05 12:19:09 2010 +0000

description:
Make the interrupt evcnt name consistent everywhere.

diffstat:

 sys/arch/hp700/dev/apic.c       |  12 ++++++++----
 sys/arch/hp700/dev/asp.c        |   5 +++--
 sys/arch/hp700/dev/dino.c       |  14 +++++++-------
 sys/arch/hp700/dev/lasi.c       |   5 +++--
 sys/arch/hp700/dev/mongoose.c   |   8 ++++----
 sys/arch/hp700/dev/siop_sgc.c   |   8 ++++----
 sys/arch/hp700/dev/wax.c        |   5 +++--
 sys/arch/hp700/gsc/com_gsc.c    |   8 ++++----
 sys/arch/hp700/gsc/gscbus.c     |  10 +++++-----
 sys/arch/hp700/gsc/gsckbc.c     |   8 ++++----
 sys/arch/hp700/gsc/harmony.c    |   6 +++---
 sys/arch/hp700/gsc/if_ie_gsc.c  |   9 ++++-----
 sys/arch/hp700/gsc/if_iee_gsc.c |   8 ++++----
 sys/arch/hp700/gsc/lpt_gsc.c    |   9 ++++-----
 sys/arch/hp700/gsc/oosiop_gsc.c |   8 ++++----
 sys/arch/hp700/gsc/osiop_gsc.c  |   8 ++++----
 sys/arch/hp700/gsc/siop_gsc.c   |   8 ++++----
 sys/arch/hp700/hp700/intr.c     |  23 +++++++++++++++--------
 sys/arch/hp700/hp700/intr.h     |   9 +++++----
 19 files changed, 92 insertions(+), 79 deletions(-)

diffs (truncated from 612 to 300 lines):

diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/dev/apic.c
--- a/sys/arch/hp700/dev/apic.c Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/dev/apic.c Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apic.c,v 1.7 2010/04/24 10:41:21 skrll Exp $   */
+/*     $NetBSD: apic.c,v 1.8 2010/12/05 12:19:09 skrll Exp $   */
 
 /*     $OpenBSD: apic.c,v 1.7 2007/10/06 23:50:54 krw Exp $    */
 
@@ -71,6 +71,7 @@
        void *arg;
        struct apic_iv *next;
        struct evcnt *cnt;
+       char aiv_name[32];
 };
 
 struct apic_iv *apic_intr_list[CPU_NINTS];
@@ -189,8 +190,11 @@
                        return NULL;
                }
 
+               snprintf(aiv->aiv_name, sizeof(aiv->aiv_name), "line %d irq %d",
+                   line, irq);
+
                evcnt_attach_dynamic(cnt, EVCNT_TYPE_INTR, NULL,
-                   device_xname(sc->sc_dv), "irq" /* XXXNH */);
+                   device_xname(sc->sc_dv), aiv->aiv_name);
                biv = apic_intr_list[irq];
                while (biv->next)
                        biv = biv->next;
@@ -199,8 +203,8 @@
                return arg;
        }
 
-       if ((iv = hp700_intr_establish(sc->sc_dv, pri, apic_intr,
-            aiv, &int_reg_cpu, irq))) {
+       iv = hp700_intr_establish(pri, apic_intr, aiv, &int_reg_cpu, irq);
+       if (iv) {
                ent0 = (31 - irq) & APIC_ENT0_VEC;
                ent0 |= apic_get_int_ent0(sc, line);
 #if 0
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/dev/asp.c
--- a/sys/arch/hp700/dev/asp.c  Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/dev/asp.c  Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asp.c,v 1.15 2009/11/03 05:07:25 snj Exp $     */
+/*     $NetBSD: asp.c,v 1.16 2010/12/05 12:19:09 skrll Exp $   */
 
 /*     $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $  */
 
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.15 2009/11/03 05:07:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.16 2010/12/05 12:19:09 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -246,6 +246,7 @@
 
        /* Establish the interrupt register. */
        hp700_intr_reg_establish(&sc->sc_int_reg);
+       sc->sc_int_reg.int_reg_name = device_xname(self);
        sc->sc_int_reg.int_reg_mask = &sc->sc_trs->asp_imr;
        sc->sc_int_reg.int_reg_req = &sc->sc_trs->asp_irr;
 
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/dev/dino.c
--- a/sys/arch/hp700/dev/dino.c Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/dev/dino.c Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dino.c,v 1.26 2010/11/08 23:10:24 skrll Exp $ */
+/*     $NetBSD: dino.c,v 1.27 2010/12/05 12:19:09 skrll Exp $ */
 
 /*     $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.26 2010/11/08 23:10:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.27 2010/12/05 12:19:09 skrll Exp $");
 
 /* #include "cardbus.h" */
 
@@ -407,8 +407,7 @@
 {
        struct dino_softc *sc = v;
 
-       return hp700_intr_establish(sc->sc_dv, pri, handler, arg,
-           &sc->sc_int_reg, ih);
+       return hp700_intr_establish(pri, handler, arg, &sc->sc_int_reg, ih);
 }
 
 void
@@ -1661,13 +1660,14 @@
        splx(s);
        /* Establish the interrupt register. */
        hp700_intr_reg_establish(&sc->sc_int_reg);
+       sc->sc_int_reg.int_reg_name = device_xname(self);
        sc->sc_int_reg.int_reg_mask = &r->imr;
        sc->sc_int_reg.int_reg_req = &r->irr0;
        sc->sc_int_reg.int_reg_level = &r->ilr;
        /* Add the I/O interrupt register. */
-       sc->sc_int_reg.int_reg_dev = device_xname(self);
-       sc->sc_ih = hp700_intr_establish(sc->sc_dv, IPL_NONE,
-           NULL, &sc->sc_int_reg, &int_reg_cpu, ca->ca_irq);
+
+       sc->sc_ih = hp700_intr_establish(IPL_NONE, NULL, &sc->sc_int_reg,
+           &int_reg_cpu, ca->ca_irq);
 
        /* TODO establish the bus error interrupt */
 
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/dev/lasi.c
--- a/sys/arch/hp700/dev/lasi.c Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/dev/lasi.c Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lasi.c,v 1.15 2009/11/03 05:07:25 snj Exp $    */
+/*     $NetBSD: lasi.c,v 1.16 2010/12/05 12:19:09 skrll Exp $  */
 
 /*     $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.15 2009/11/03 05:07:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.16 2010/12/05 12:19:09 skrll Exp $");
 
 #undef LASIDEBUG
 
@@ -190,6 +190,7 @@
 
        /* Establish the interrupt register. */
        hp700_intr_reg_establish(&sc->sc_int_reg);
+       sc->sc_int_reg.int_reg_name = device_xname(self);
        sc->sc_int_reg.int_reg_mask = &sc->sc_trs->lasi_imr;
        sc->sc_int_reg.int_reg_req = &sc->sc_trs->lasi_irr;
 
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/dev/mongoose.c
--- a/sys/arch/hp700/dev/mongoose.c     Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/dev/mongoose.c     Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mongoose.c,v 1.19 2010/02/10 20:32:34 skrll Exp $      */
+/*     $NetBSD: mongoose.c,v 1.20 2010/12/05 12:19:09 skrll Exp $      */
 
 /*     $OpenBSD: mongoose.c,v 1.19 2010/01/01 20:28:42 kettenis Exp $  */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.19 2010/02/10 20:32:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.20 2010/12/05 12:19:09 skrll Exp $");
 
 #define MONGOOSE_DEBUG 9
 
@@ -709,6 +709,6 @@
 #undef R
 
        /* attach interrupt */
-       sc->sc_ih = hp700_intr_establish(sc->sc_dev, IPL_NONE, mg_intr, sc,
-           &int_reg_cpu, ca->ca_irq);
+       sc->sc_ih = hp700_intr_establish(IPL_NONE, mg_intr, sc, &int_reg_cpu,
+           ca->ca_irq);
 }
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/dev/siop_sgc.c
--- a/sys/arch/hp700/dev/siop_sgc.c     Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/dev/siop_sgc.c     Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siop_sgc.c,v 1.5 2009/05/24 06:53:34 skrll Exp $       */
+/*     $NetBSD: siop_sgc.c,v 1.6 2010/12/05 12:19:09 skrll Exp $       */
 
 /*     $OpenBSD: siop_sgc.c,v 1.1 2007/08/05 19:09:52 kettenis Exp $   */
 
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.5 2009/05/24 06:53:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.6 2010/12/05 12:19:09 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -134,8 +134,8 @@
 
        siop_attach(&sgc->sc_siop);
 
-       (void)hp700_intr_establish(self, IPL_BIO,
-           siop_intr, sc, &int_reg_cpu, ca->ca_irq);
+       (void)hp700_intr_establish(IPL_BIO, siop_intr, sc, &int_reg_cpu,
+           ca->ca_irq);
 }
 
 void
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/dev/wax.c
--- a/sys/arch/hp700/dev/wax.c  Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/dev/wax.c  Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wax.c,v 1.15 2010/02/10 20:33:27 skrll Exp $   */
+/*     $NetBSD: wax.c,v 1.16 2010/12/05 12:19:09 skrll Exp $   */
 
 /*     $OpenBSD: wax.c,v 1.1 1998/11/23 03:04:10 mickey Exp $  */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.15 2010/02/10 20:33:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.16 2010/12/05 12:19:09 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -149,6 +149,7 @@
 
        /* Establish the interrupt register. */
        hp700_intr_reg_establish(&sc->sc_int_reg);
+       sc->sc_int_reg.int_reg_name = device_xname(self);
        sc->sc_int_reg.int_reg_mask = &sc->sc_regs->wax_imr;
        sc->sc_int_reg.int_reg_req = &sc->sc_regs->wax_irr;
 
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/gsc/com_gsc.c
--- a/sys/arch/hp700/gsc/com_gsc.c      Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/gsc/com_gsc.c      Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_gsc.c,v 1.14 2009/11/03 05:07:25 snj Exp $ */
+/*     $NetBSD: com_gsc.c,v 1.15 2010/12/05 12:19:09 skrll Exp $       */
 
 /*     $OpenBSD: com_gsc.c,v 1.8 2000/03/13 14:39:59 mickey Exp $      */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.14 2009/11/03 05:07:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.15 2010/12/05 12:19:09 skrll Exp $");
 
 #include "opt_kgdb.h"
 
@@ -138,8 +138,8 @@
        COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
 
        com_attach_subr(sc);
-       gsc->sc_ih = hp700_intr_establish(sc->sc_dev, IPL_TTY,
-           comintr, sc, ga->ga_int_reg, ga->ga_irq);
+       gsc->sc_ih = hp700_intr_establish(IPL_TTY, comintr, sc, ga->ga_int_reg,
+           ga->ga_irq);
 }
 
 #ifdef KGDB
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/gsc/gscbus.c
--- a/sys/arch/hp700/gsc/gscbus.c       Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/gsc/gscbus.c       Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gscbus.c,v 1.19 2009/11/21 15:36:33 rmind Exp $        */
+/*     $NetBSD: gscbus.c,v 1.20 2010/12/05 12:19:09 skrll Exp $        */
 
 /*     $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $        */
 
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.19 2009/11/21 15:36:33 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.20 2010/12/05 12:19:09 skrll Exp $");
 
 #define GSCDEBUG
 
@@ -148,9 +148,9 @@
        aprint_normal("\n");
 
        /* Add the I/O subsystem's interrupt register. */
-       ga->ga_int_reg->int_reg_dev = device_xname(parent);
-       sc->sc_ih = hp700_intr_establish(sc->sc_dev, IPL_NONE, NULL,
-           ga->ga_int_reg, &int_reg_cpu, ga->ga_irq);
+       ga->ga_int_reg->int_reg_name = device_xname(self);
+       sc->sc_ih = hp700_intr_establish(IPL_NONE, NULL, ga->ga_int_reg,
+           &int_reg_cpu, ga->ga_irq);
 
        ga->ga_ca.ca_nmodules = MAXMODBUS;
        ga->ga_ca.ca_hpabase = 0;
diff -r e58e5a313cec -r b220da3920d4 sys/arch/hp700/gsc/gsckbc.c
--- a/sys/arch/hp700/gsc/gsckbc.c       Sun Dec 05 10:47:22 2010 +0000
+++ b/sys/arch/hp700/gsc/gsckbc.c       Sun Dec 05 12:19:09 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gsckbc.c,v 1.5 2009/05/08 09:33:58 skrll Exp $ */
+/* $NetBSD: gsckbc.c,v 1.6 2010/12/05 12:19:09 skrll Exp $ */
 /*
  * Copyright (c) 2004 Jochen Kunz.
  * All rights reserved.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.5 2009/05/08 09:33:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1.6 2010/12/05 12:19:09 skrll Exp $");
 
 /* autoconfig and device stuff */
 #include <sys/param.h>
@@ -267,8 +267,8 @@