Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to intr_establish_xname().

Browse Source
This commit is contained in:
rin 2021-03-17 14:50:11 +00:00
parent abfcffbda7
commit ac5d131cb7
5 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/sandpoint/pci/pciide_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide_machdep.c,v 1.5 2011/06/18 08:08:30 matt Exp $ */
/* $NetBSD: pciide_machdep.c,v 1.6 2021/03/17 14:50:11 rin Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2011/06/18 08:08:30 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.6 2021/03/17 14:50:11 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -65,7 +65,8 @@ pciide_machdep_compat_intr_establish(device_t dev,
void *cookie;
irq = PCIIDE_COMPAT_IRQ(chan);
cookie = isa_intr_establish(NULL, irq, IST_LEVEL, IPL_BIO, func, arg);
cookie = isa_intr_establish_xname(NULL, irq, IST_LEVEL, IPL_BIO, func,
arg, device_xname(dev));
if (cookie == NULL)
return (NULL);
aprint_normal_dev(dev, "%s channel interrupting at irq %d\n",

7
sys/arch/sandpoint/sandpoint/com_eumb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_eumb.c,v 1.10 2019/04/07 15:44:44 jdc Exp $ */
/* $NetBSD: com_eumb.c,v 1.11 2021/03/17 14:50:11 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.10 2019/04/07 15:44:44 jdc Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v 1.11 2021/03/17 14:50:11 rin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -101,7 +101,8 @@ com_eumb_attach(device_t parent, device_t self, void *aux)
com_attach_subr(sc);
intr_establish(epicirq + I8259_ICU, IST_LEVEL, IPL_SERIAL, comintr, sc);
intr_establish_xname(epicirq + I8259_ICU, IST_LEVEL, IPL_SERIAL,
comintr, sc, device_xname(self));
aprint_normal_dev(self, "interrupting at irq %d\n",
epicirq + I8259_ICU);
}

7
sys/arch/sandpoint/sandpoint/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.67 2018/07/15 05:16:44 maxv Exp $ */
/* $NetBSD: machdep.c,v 1.68 2021/03/17 14:50:11 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2018/07/15 05:16:44 maxv Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.68 2021/03/17 14:50:11 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -257,7 +257,8 @@ cpu_startup(void)
* set up i8259 as a cascade on EPIC irq 0.
* XXX exceptional SP2 has 17
*/
intr_establish(16, IST_LEVEL, IPL_HIGH, pic_handle_intr, isa_pic);
intr_establish_xname(16, IST_LEVEL, IPL_HIGH, pic_handle_intr, isa_pic,
"i8259");
#else
mpcpic_reserv16();
(void)setup_mpcpic(baseaddr);

7
sys/arch/sandpoint/sandpoint/nhpow.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nhpow.c,v 1.1 2012/01/14 19:39:25 phx Exp $ */
/* $NetBSD: nhpow.c,v 1.2 2021/03/17 14:50:11 rin Exp $ */
/*-
* Copyright (c) 2012 Frank Wille.
@ -32,7 +32,7 @@
* NH230/231 power and LED control, button handling
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nhpow.c,v 1.1 2012/01/14 19:39:25 phx Exp $");
__KERNEL_RCSID(0, "$NetBSD: nhpow.c,v 1.2 2021/03/17 14:50:11 rin Exp $");
#include "gpio.h"
#include <sys/param.h>
@ -152,7 +152,8 @@ nhpow_attach(device_t parent, device_t self, void *aux)
callout_init(&sc->sc_ch_pbutton, 0); /* power-button callout */
/* establish button interrupt handler */
intr_establish(I8259_ICU + 4, IST_EDGE_RISING, IPL_SCHED, hwintr, sc);
intr_establish_xname(I8259_ICU + 4, IST_EDGE_RISING, IPL_SCHED, hwintr,
sc, device_xname(self));
aprint_normal_dev(self, "interrupting at irq %d\n", I8259_ICU + 4);
/* register power button with sysmon */

12
sys/arch/sandpoint/sandpoint/satmgr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: satmgr.c,v 1.29 2021/01/04 15:36:22 thorpej Exp $ */
/* $NetBSD: satmgr.c,v 1.30 2021/03/17 14:50:11 rin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@ -209,6 +209,7 @@ satmgr_attach(device_t parent, device_t self, void *aux)
struct btinfo_prodfamily *pfam;
struct satops *ops;
int i, sataddr, epicirq;
char intr_xname[INTRDEVNAMEBUF];
found = 1;
@ -251,7 +252,8 @@ satmgr_attach(device_t parent, device_t self, void *aux)
cv_init(&sc->sc_repcv, "stalk");
epicirq = (eaa->eumb_unit == 0) ? 24 : 25;
intr_establish(epicirq + I8259_ICU, IST_LEVEL, IPL_SERIAL, hwintr, sc);
intr_establish_xname(epicirq + I8259_ICU, IST_LEVEL, IPL_SERIAL,
hwintr, sc, device_xname(self));
aprint_normal_dev(self, "interrupting at irq %d\n",
epicirq + I8259_ICU);
sc->sc_si = softint_establish(SOFTINT_SERIAL, swintr, sc);
@ -321,8 +323,10 @@ satmgr_attach(device_t parent, device_t self, void *aux)
CTL_CREATE, CTL_EOL);
}
else if (strcmp(ops->family, "kurot4") == 0) {
intr_establish(2 + I8259_ICU,
IST_LEVEL, IPL_SERIAL, mbtnintr, sc);
snprintf(intr_xname, sizeof(intr_xname), "%s mbtn",
device_xname(self));
intr_establish_xname(2 + I8259_ICU,
IST_LEVEL, IPL_SERIAL, mbtnintr, sc, intr_xname);
}
md_reboot = satmgr_reboot; /* cpu_reboot() hook */