[src/netbsd-1-6]: src/sys/arch/shark/isa Pull up revision 1.2 (requested by c...

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

details:   https://anonhg.NetBSD.org/src/rev/29a1319967ee
branches:  netbsd-1-6
changeset: 529113:29a1319967ee
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Sep 30 13:28:57 2002 +0000

description:
Pull up revision 1.2 (requested by cgd in ticket #858):
For ISA intrs 0-15, use string of the form "isa intr NN", rather than
just "isa intr".  Having vmstat -i show multiple "isa intr" lines w/
different counts is less than desirable.  Reviewed by thorpej.

diffstat:

 sys/arch/shark/isa/isa_shark_machdep.c |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 11d36761fdf2 -r 29a1319967ee sys/arch/shark/isa/isa_shark_machdep.c
--- a/sys/arch/shark/isa/isa_shark_machdep.c    Mon Sep 30 13:26:14 2002 +0000
+++ b/sys/arch/shark/isa/isa_shark_machdep.c    Mon Sep 30 13:28:57 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_shark_machdep.c,v 1.1 2002/02/10 01:57:55 thorpej Exp $    */
+/*     $NetBSD: isa_shark_machdep.c,v 1.1.12.1 2002/09/30 13:28:57 lukem Exp $ */
 
 /*
  * Copyright 1997
@@ -147,6 +147,13 @@
 /*
  * Set up an interrupt handler to start being called.
  */
+static const char * const isa_intr_names[16] = {
+       "isa intr  0", "isa intr  1", "isa intr  2", "isa intr  3",
+       "isa intr  4", "isa intr  5", "isa intr  6", "isa intr  7",
+       "isa intr  8", "isa intr  9", "isa intr 10", "isa intr 11",
+       "isa intr 12", "isa intr 13", "isa intr 14", "isa intr 15"
+};
+
 void *
 isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
        isa_chipset_tag_t ic;
@@ -175,7 +182,11 @@
            ih->ih_func = ih_fun;
            ih->ih_arg = ih_arg;
            ih->ih_level = level;
-           ih->ih_name = "isa intr";
+           if (irq >= 0 &&
+               irq < (sizeof isa_intr_names / sizeof isa_intr_names[0]))
+                   ih->ih_name = isa_intr_names[irq];
+           else
+                   ih->ih_name = "isa intr";
 
            if (irq_claim(irq, ih) == -1)
                panic("isa_intr_establish: can't install handler");