diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/tc/cfb.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/ioasic.c | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/scc.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/tc_3000_300.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/tc_3000_500.c | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/tc_conf.h | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index fd9f4eb7280..f99dc77252e 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb.c,v 1.18 2006/11/29 12:13:51 miod Exp $ */ +/* $OpenBSD: cfb.c,v 1.19 2007/11/06 18:20:05 miod Exp $ */ /* $NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $ */ /* @@ -219,7 +219,7 @@ cfbattach(parent, self, aux) sc->sc_dc->dc_depth); /* Establish an interrupt handler, and clear any pending interrupts */ - tc_intr_establish(parent, ta->ta_cookie, TC_IPL_TTY, cfbintr, sc); + tc_intr_establish(parent, ta->ta_cookie, IPL_TTY, cfbintr, sc); *(volatile u_int32_t *)(sc->sc_dc->dc_vaddr + CFB_IREQCTRL_OFFSET) = 0; /* initialize the raster */ diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c index ae84d535e64..c8452a13eb3 100644 --- a/sys/arch/alpha/tc/ioasic.c +++ b/sys/arch/alpha/tc/ioasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioasic.c,v 1.12 2006/03/04 12:33:17 miod Exp $ */ +/* $OpenBSD: ioasic.c,v 1.13 2007/11/06 18:20:05 miod Exp $ */ /* $NetBSD: ioasic.c,v 1.34 2000/07/18 06:10:06 thorpej Exp $ */ /*- @@ -207,7 +207,7 @@ ioasicattach(parent, self, aux) evcount_attach(&ioasicintrs[i].iai_count, ioasicintrs[i].iai_name, NULL, &evcount_intr); } - tc_intr_establish(parent, ta->ta_cookie, TC_IPL_NONE, ioasic_intr, sc); + tc_intr_establish(parent, ta->ta_cookie, IPL_NONE, ioasic_intr, sc); /* * Try to configure each device. @@ -219,7 +219,7 @@ void ioasic_intr_establish(ioa, cookie, level, func, arg) struct device *ioa; void *cookie, *arg; - tc_intrlevel_t level; + int level; int (*func)(void *); { struct ioasic_softc *sc = (void *)ioasic_cd.cd_devs[0]; diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c index 00aa9a6b1e2..335a0dea65c 100644 --- a/sys/arch/alpha/tc/scc.c +++ b/sys/arch/alpha/tc/scc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scc.c,v 1.20 2004/09/19 21:34:42 mickey Exp $ */ +/* $OpenBSD: scc.c,v 1.21 2007/11/06 18:20:05 miod Exp $ */ /* $NetBSD: scc.c,v 1.58 2002/03/17 19:40:27 atatat Exp $ */ /* @@ -309,7 +309,7 @@ sccattach(parent, self, aux) #endif /* Register the interrupt handler. */ - ioasic_intr_establish(parent, d->iada_cookie, TC_IPL_TTY, + ioasic_intr_establish(parent, d->iada_cookie, IPL_TTY, sccintr, (void *)sc); /* diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c index fe6940fa6f9..8260f51a230 100644 --- a/sys/arch/alpha/tc/tc_3000_300.c +++ b/sys/arch/alpha/tc/tc_3000_300.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_3000_300.c,v 1.12 2006/03/04 12:33:17 miod Exp $ */ +/* $OpenBSD: tc_3000_300.c,v 1.13 2007/11/06 18:20:05 miod Exp $ */ /* $NetBSD: tc_3000_300.c,v 1.26 2001/07/27 00:25:21 thorpej Exp $ */ /* @@ -117,7 +117,7 @@ void tc_3000_300_intr_establish(tcadev, cookie, level, func, arg) struct device *tcadev; void *cookie, *arg; - tc_intrlevel_t level; + int level; int (*func)(void *); { volatile u_int32_t *imskp; diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c index 10b7807f481..d82ec73b8e9 100644 --- a/sys/arch/alpha/tc/tc_3000_500.c +++ b/sys/arch/alpha/tc/tc_3000_500.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_3000_500.c,v 1.13 2006/03/04 12:33:17 miod Exp $ */ +/* $OpenBSD: tc_3000_500.c,v 1.14 2007/11/06 18:20:05 miod Exp $ */ /* $NetBSD: tc_3000_500.c,v 1.24 2001/07/27 00:25:21 thorpej Exp $ */ /* @@ -50,7 +50,7 @@ extern int sfb_cnattach(tc_addr_t); void tc_3000_500_intr_setup(void); void tc_3000_500_intr_establish(struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *); + int, int (*)(void *), void *); void tc_3000_500_intr_disestablish(struct device *, void *); void tc_3000_500_iointr(void *, unsigned long); @@ -141,7 +141,7 @@ void tc_3000_500_intr_establish(tcadev, cookie, level, func, arg) struct device *tcadev; void *cookie, *arg; - tc_intrlevel_t level; + int level; int (*func)(void *); { u_long dev = (u_long)cookie; diff --git a/sys/arch/alpha/tc/tc_conf.h b/sys/arch/alpha/tc/tc_conf.h index b4391d67ef8..3f813b708ab 100644 --- a/sys/arch/alpha/tc/tc_conf.h +++ b/sys/arch/alpha/tc/tc_conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_conf.h,v 1.8 2004/06/28 02:28:43 aaron Exp $ */ +/* $OpenBSD: tc_conf.h,v 1.9 2007/11/06 18:20:05 miod Exp $ */ /* $NetBSD: tc_conf.h,v 1.10 2000/06/04 19:14:29 cgd Exp $ */ /* @@ -39,7 +39,7 @@ extern void tc_3000_500_intr_setup(void); extern void tc_3000_500_iointr(void *, unsigned long); extern void tc_3000_500_intr_establish(struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *); + int, int (*)(void *), void *); extern void tc_3000_500_intr_disestablish(struct device *, void *); extern int tc_3000_500_nslots; @@ -57,7 +57,7 @@ extern void tc_3000_300_intr_setup(void); extern void tc_3000_300_iointr(void *, unsigned long); extern void tc_3000_300_intr_establish(struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *); + int, int (*)(void *), void *); extern void tc_3000_300_intr_disestablish(struct device *, void *); extern int tc_3000_300_nslots; |