[src/netbsd-1-6]: src/sys/arch/arm/xscale Pull up revision 1.3 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/4b82603c5540
branches:  netbsd-1-6
changeset: 529335:4b82603c5540
user:      he <he%NetBSD.org@localhost>
date:      Mon Nov 11 23:35:32 2002 +0000

description:
Pull up revision 1.3 (requested by thorpej in ticket #583):
  Use more descriptive interrupt names.

diffstat:

 sys/arch/arm/xscale/i80321_icu.c |  43 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r ab4f80b69688 -r 4b82603c5540 sys/arch/arm/xscale/i80321_icu.c
--- a/sys/arch/arm/xscale/i80321_icu.c  Mon Nov 11 23:35:15 2002 +0000
+++ b/sys/arch/arm/xscale/i80321_icu.c  Mon Nov 11 23:35:32 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80321_icu.c,v 1.2 2002/03/28 03:19:31 thorpej Exp $   */
+/*     $NetBSD: i80321_icu.c,v 1.2.6.1 2002/11/11 23:35:32 he Exp $    */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -99,6 +99,44 @@
        IPL_SOFTSERIAL,         /* SI_SOFTSERIAL */
 };
 
+/*
+ * Interrupt bit names.
+ */
+const char *i80321_irqnames[] = {
+       "DMA0 EOT",
+       "DMA0 EOC",
+       "DMA1 EOT",
+       "DMA1 EOC",
+       "irq 4",
+       "irq 5",
+       "AAU EOT",
+       "AAU EOC",
+       "core PMU",
+       "TMR0 (hardclock)",
+       "TMR1",
+       "I2C0",
+       "I2C1",
+       "MU",
+       "BIST",
+       "periph PMU",
+       "XScale PMU",
+       "BIU error",
+       "ATU error",
+       "MCU error",
+       "DMA0 error",
+       "DMA1 error",
+       "irq 22",
+       "AAU error",
+       "MU error",
+       "SSP",
+       "irq 26",
+       "irq 27",
+       "irq 28",
+       "irq 29",
+       "irq 30",
+       "irq 31",
+};
+
 void   i80321_intr_dispatch(struct clockframe *frame);
 
 static __inline uint32_t
@@ -396,9 +434,8 @@
                iq = &intrq[i];
                TAILQ_INIT(&iq->iq_list);
 
-               sprintf(iq->iq_name, "irq %d", i);
                evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
-                   NULL, "iop321", iq->iq_name);
+                   NULL, "iop321", i80321_irqnames[i]);
        }
 
        i80321_intr_calculate_masks();