sysasic_intr_string() takes an IRL, not an IPL.
This commit is contained in:
parent
541195ef5d
commit
b66028ed66
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: aica.c,v 1.17 2008/01/06 10:33:24 he Exp $ */
|
||||
/* $NetBSD: aica.c,v 1.18 2008/08/01 20:19:49 marcus Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2003 SHIMIZU Ryo <ryo@misakimix.org>
|
||||
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.17 2008/01/06 10:33:24 he Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.18 2008/08/01 20:19:49 marcus Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -246,7 +246,7 @@ aica_attach(struct device *parent, struct device *self, void *aux)
|
|||
aica_enable(sc);
|
||||
|
||||
printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname,
|
||||
sysasic_intr_string(IPL_BIO));
|
||||
sysasic_intr_string(SYSASIC_IRL9));
|
||||
sysasic_intr_establish(SYSASIC_EVENT_AICA, IPL_BIO, SYSASIC_IRL9,
|
||||
aica_intr, sc);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: gapspci_pci.c,v 1.10 2007/03/12 14:03:47 tsutsui Exp $ */
|
||||
/* $NetBSD: gapspci_pci.c,v 1.11 2008/08/01 20:19:49 marcus Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 Marcus Comstedt.
|
||||
|
@ -38,7 +38,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.10 2007/03/12 14:03:47 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.11 2008/08/01 20:19:49 marcus Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -200,7 +200,7 @@ const char *
|
|||
gaps_intr_string(void *v, pci_intr_handle_t ih)
|
||||
{
|
||||
|
||||
return sysasic_intr_string(IPL_NET);
|
||||
return sysasic_intr_string(SYSASIC_IRL11);
|
||||
}
|
||||
|
||||
void *
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: gdrom.c,v 1.25 2008/06/11 14:55:30 tsutsui Exp $ */
|
||||
/* $NetBSD: gdrom.c,v 1.26 2008/08/01 20:19:49 marcus Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 Marcus Comstedt
|
||||
|
@ -33,7 +33,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
__KERNEL_RCSID(0, "$NetBSD: gdrom.c,v 1.25 2008/06/11 14:55:30 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: gdrom.c,v 1.26 2008/08/01 20:19:49 marcus Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -395,7 +395,7 @@ gdromattach(struct device *parent, struct device *self, void *aux)
|
|||
for (p = 0; p < 0x200000 / 4; p++)
|
||||
x = ((volatile uint32_t *)0xa0000000)[p];
|
||||
|
||||
printf(": %s\n", sysasic_intr_string(IPL_BIO));
|
||||
printf(": %s\n", sysasic_intr_string(SYSASIC_IRL9));
|
||||
sysasic_intr_establish(SYSASIC_EVENT_GDROM, IPL_BIO, SYSASIC_IRL9,
|
||||
gdrom_intr, sc);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: maple.c,v 1.38 2008/06/08 16:39:43 tsutsui Exp $ */
|
||||
/* $NetBSD: maple.c,v 1.39 2008/08/01 20:19:49 marcus Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
|
@ -62,7 +62,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.38 2008/06/08 16:39:43 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.39 2008/08/01 20:19:49 marcus Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
|
@ -102,6 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.38 2008/06/08 16:39:43 tsutsui Exp $");
|
|||
/* interrupt priority level */
|
||||
#define IPL_MAPLE IPL_BIO
|
||||
#define splmaple() splbio()
|
||||
#define IRL_MAPLE SYSASIC_IRL9
|
||||
|
||||
/*
|
||||
* Function declarations.
|
||||
|
@ -189,7 +190,7 @@ mapleattach(struct device *parent, struct device *self, void *aux)
|
|||
|
||||
sc = (struct maple_softc *)self;
|
||||
|
||||
printf(": %s\n", sysasic_intr_string(IPL_MAPLE));
|
||||
printf(": %s\n", sysasic_intr_string(IRL_MAPLE));
|
||||
|
||||
if (maple_alloc_dma(MAPLE_DMABUF_SIZE, &dmabuffer, &dmabuffer_phys)) {
|
||||
printf("%s: unable to allocate DMA buffers.\n",
|
||||
|
@ -240,7 +241,7 @@ mapleattach(struct device *parent, struct device *self, void *aux)
|
|||
callout_init(&sc->maple_callout_ch, 0);
|
||||
|
||||
sc->sc_intrhand = sysasic_intr_establish(SYSASIC_EVENT_MAPLE_DMADONE,
|
||||
IPL_MAPLE, SYSASIC_IRL9, maple_intr, sc);
|
||||
IPL_MAPLE, IRL_MAPLE, maple_intr, sc);
|
||||
|
||||
config_pending_incr(); /* create thread before mounting root */
|
||||
|
||||
|
|
Loading…
Reference in New Issue