diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2001-06-26 18:19:44 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2001-06-26 18:19:44 +0000 |
| commit | 5a387b616d2b4b2e54c16ba3f9e3086f399b333d (patch) | |
| tree | 108845b3cd77c21fda9458cf417d03638dd40baf /sys/arch/powerpc/mac | |
| parent | e816cf3344c5b942d0e8ab825f7d0eb98eae184c (diff) | |
Cleanup of interrupt configuration, move prototypes to header file,
not in each file.
Diffstat (limited to 'sys/arch/powerpc/mac')
| -rw-r--r-- | sys/arch/powerpc/mac/macintr.c | 7 | ||||
| -rw-r--r-- | sys/arch/powerpc/mac/openpic.c | 9 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sys/arch/powerpc/mac/macintr.c b/sys/arch/powerpc/mac/macintr.c index 88641d3d8af..6fb703aee06 100644 --- a/sys/arch/powerpc/mac/macintr.c +++ b/sys/arch/powerpc/mac/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.10 2001/06/25 23:29:56 drahn Exp $ */ +/* $OpenBSD: macintr.c,v 1.11 2001/06/26 18:19:43 drahn Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -144,11 +144,6 @@ u_int8_t *interrupt_reg; typedef void (void_f) (void); extern void_f *pending_int_f; int prog_switch (void *arg); -typedef int mac_intr_handle_t; - -typedef void *(intr_establish_t) __P((void *, mac_intr_handle_t, - int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); intr_establish_t macintr_establish; intr_disestablish_t macintr_disestablish; diff --git a/sys/arch/powerpc/mac/openpic.c b/sys/arch/powerpc/mac/openpic.c index 41fd638f1ed..fb5523d860d 100644 --- a/sys/arch/powerpc/mac/openpic.c +++ b/sys/arch/powerpc/mac/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.12 2001/06/25 23:29:56 drahn Exp $ */ +/* $OpenBSD: openpic.c,v 1.13 2001/06/26 18:19:43 drahn Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -134,11 +134,6 @@ u_int8_t *interrupt_reg; typedef void (void_f) (void); extern void_f *pending_int_f; static int prog_switch (void *arg); -typedef int mac_intr_handle_t; - -typedef void *(intr_establish_t) __P((void *, mac_intr_handle_t, - int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); vaddr_t openpic_base; void * openpic_intr_establish( void * lcv, int irq, int type, int level, @@ -177,7 +172,7 @@ openpic_attach(parent, self, aux) #if 1 mac_intr_establish(parent, 0x37, IST_LEVEL, - IPL_HIGH, prog_switch, 0x37, "prog button"); + IPL_HIGH, prog_switch, (void*)0x37, "prog button"); #endif ppc_intr_enable(1); |