[src/trunk]: src/sys/dev provide intr xname

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

details:   https://anonhg.NetBSD.org/src/rev/f6c9531121e6
branches:  trunk
changeset: 348443:f6c9531121e6
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Oct 18 22:08:30 2016 +0000

description:
provide intr xname

diffstat:

 sys/dev/acpi/pckbc_acpi.c |  14 ++++++++++----
 sys/dev/isa/com_isa.c     |   8 ++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 181b041c15f3 -r f6c9531121e6 sys/dev/acpi/pckbc_acpi.c
--- a/sys/dev/acpi/pckbc_acpi.c Tue Oct 18 22:04:33 2016 +0000
+++ b/sys/dev/acpi/pckbc_acpi.c Tue Oct 18 22:08:30 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pckbc_acpi.c,v 1.34 2013/10/17 21:19:03 christos Exp $ */
+/*     $NetBSD: pckbc_acpi.c,v 1.35 2016/10/18 22:08:30 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.34 2013/10/17 21:19:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.35 2016/10/18 22:08:30 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -252,8 +252,14 @@
                        break;
                }
        }
-       if (i < pckbc_cd.cd_ndevs)
-               rv = isa_intr_establish(ic, irq, ist, IPL_TTY, pckbcintr, sc);
+       if (i < pckbc_cd.cd_ndevs) {
+               char intr_xname[64];
+               snprintf(intr_xname, sizeof(intr_xname), "%s %s",
+                   device_xname(psc->sc_pckbc.sc_dv), pckbc_slot_names[slot]);
+
+               rv = isa_intr_establish_xname(ic, irq, ist, IPL_TTY, pckbcintr,
+                   sc, intr_xname);
+       }
        if (rv == NULL) {
                aprint_error_dev(sc->sc_dv,
                    "unable to establish interrupt for %s slot\n",
diff -r 181b041c15f3 -r f6c9531121e6 sys/dev/isa/com_isa.c
--- a/sys/dev/isa/com_isa.c     Tue Oct 18 22:04:33 2016 +0000
+++ b/sys/dev/isa/com_isa.c     Tue Oct 18 22:08:30 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_isa.c,v 1.39 2010/02/24 22:37:58 dyoung Exp $      */
+/*     $NetBSD: com_isa.c,v 1.40 2016/10/18 22:08:30 jdolecek Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.39 2010/02/24 22:37:58 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.40 2016/10/18 22:08:30 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -213,8 +213,8 @@
 
        isc->sc_ic = ia->ia_ic;
        isc->sc_irq = irq;
-       isc->sc_ih = isa_intr_establish(ia->ia_ic, irq, IST_EDGE, IPL_SERIAL,
-           comintr, sc);
+       isc->sc_ih = isa_intr_establish_xname(ia->ia_ic, irq, IST_EDGE,
+           IPL_SERIAL, comintr, sc, device_xname(sc->sc_dev));
 }
 
 static bool