Module Name: src
Committed By: jdolecek
Date: Tue Oct 18 22:08:31 UTC 2016
Modified Files:
src/sys/dev/acpi: pckbc_acpi.c
src/sys/dev/isa: com_isa.c
Log Message:
provide intr xname
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/acpi/pckbc_acpi.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/isa/com_isa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.34 src/sys/dev/acpi/pckbc_acpi.c:1.35
--- src/sys/dev/acpi/pckbc_acpi.c:1.34 Thu Oct 17 21:19:03 2013
+++ src/sys/dev/acpi/pckbc_acpi.c Tue Oct 18 22:08:30 2016
@@ -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 @@ pckbc_acpi_intr_establish(struct pckbc_s
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",
Index: src/sys/dev/isa/com_isa.c
diff -u src/sys/dev/isa/com_isa.c:1.39 src/sys/dev/isa/com_isa.c:1.40
--- src/sys/dev/isa/com_isa.c:1.39 Wed Feb 24 22:37:58 2010
+++ src/sys/dev/isa/com_isa.c Tue Oct 18 22:08:30 2016
@@ -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 @@ com_isa_attach(device_t parent, device_t
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
