Module Name: src
Committed By: rin
Date: Tue Mar 2 12:01:02 UTC 2021
Modified Files:
src/sys/arch/evbppc/explora/dev: com_elb.c le_elb.c pckbc_elb.c
Log Message:
Convert to intr_establish_xname().
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/com_elb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/explora/dev/le_elb.c \
src/sys/arch/evbppc/explora/dev/pckbc_elb.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/arch/evbppc/explora/dev/com_elb.c
diff -u src/sys/arch/evbppc/explora/dev/com_elb.c:1.10 src/sys/arch/evbppc/explora/dev/com_elb.c:1.11
--- src/sys/arch/evbppc/explora/dev/com_elb.c:1.10 Sat Dec 8 17:46:11 2018
+++ src/sys/arch/evbppc/explora/dev/com_elb.c Tue Mar 2 12:01:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $ */
+/* $NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -87,5 +87,6 @@ com_elb_attach(device_t parent, device_t
com_attach_subr(sc);
- intr_establish(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc);
+ intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc,
+ device_xname(self));
}
Index: src/sys/arch/evbppc/explora/dev/le_elb.c
diff -u src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 src/sys/arch/evbppc/explora/dev/le_elb.c:1.10
--- src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 Fri Jul 1 19:02:32 2011
+++ src/sys/arch/evbppc/explora/dev/le_elb.c Tue Mar 2 12:01:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */
+/* $NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -170,7 +170,8 @@ le_elb_attach(device_t parent, device_t
/* Chip is stopped. Set "software style" to 32-bit. */
le_wrcsr(sc, LE_CSR58, 2);
- intr_establish(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr, sc);
+ intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr,
+ sc, device_xname(self));
}
/*
Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c
diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.10
--- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 Tue Mar 2 11:59:49 2021
+++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Tue Mar 2 12:01:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $ */
+/* $NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -116,7 +116,8 @@ pckbc_elb_intr_establish(struct pckbc_so
*/
if (irq >= 0)
- intr_establish(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc);
+ intr_establish_xname(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc,
+ device_xname(sc->sc_dv));
msc->sc_irq = -1;
}
