Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/pic Include PIC name to interrupt source, i...



details:   https://anonhg.NetBSD.org/src/rev/0000add52b3d
branches:  trunk
changeset: 960031:0000add52b3d
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Mar 06 07:24:24 2021 +0000

description:
Include PIC name to interrupt source, instead of just "irq", so that
it appears in "interrupt id" field of intrctl(8).

Should be useful when multiple PICs are simultaneously available as in
405EX (where uic[12] are cascaded to uic0).

diffstat:

 sys/arch/powerpc/pic/intr.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 8b5f1554fb9a -r 0000add52b3d sys/arch/powerpc/pic/intr.c
--- a/sys/arch/powerpc/pic/intr.c       Sat Mar 06 05:37:18 2021 +0000
+++ b/sys/arch/powerpc/pic/intr.c       Sat Mar 06 07:24:24 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.30 2021/03/02 07:37:27 rin Exp $ */
+/*     $NetBSD: intr.c,v 1.31 2021/03/06 07:24:24 rin Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -29,7 +29,7 @@
 #define __INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.30 2021/03/02 07:37:27 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.31 2021/03/06 07:24:24 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_interrupt.h"
@@ -200,8 +200,8 @@
                break;
        }
        if (is->is_hand == NULL) {
-               snprintf(is->is_source, sizeof(is->is_source), "irq %d",
-                   is->is_hwirq);
+               snprintf(is->is_source, sizeof(is->is_source), "%s %d",
+                   pic->pic_name, is->is_hwirq);
                evcnt_attach_dynamic(&is->is_ev, EVCNT_TYPE_INTR, NULL,
                    pic->pic_name, is->is_source);
        }



Home | Main Index | Thread Index | Old Index