diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-09-02 13:39:24 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-09-02 13:39:24 +0000 |
| commit | 953d0894c4f45a1b89c82246921be5f8bf68ed2b (patch) | |
| tree | 2c4c6034fb833d42185d27c3ffdf333023584472 | |
| parent | 701e372bb40d84a5597545488b3cc12871c00e7e (diff) | |
remove a bunch of orphaned prototypes and unused functions; ok miod
| -rw-r--r-- | sys/arch/amd64/amd64/i8259.c | 13 | ||||
| -rw-r--r-- | sys/arch/amd64/include/i8259.h | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/i8259.h | 3 |
3 files changed, 3 insertions, 19 deletions
diff --git a/sys/arch/amd64/amd64/i8259.c b/sys/arch/amd64/amd64/i8259.c index b520ecde20e..b947a3a01b0 100644 --- a/sys/arch/amd64/amd64/i8259.c +++ b/sys/arch/amd64/amd64/i8259.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.c,v 1.8 2015/03/14 03:38:46 jsg Exp $ */ +/* $OpenBSD: i8259.c,v 1.9 2015/09/02 13:39:23 mikeb Exp $ */ /* $NetBSD: i8259.c,v 1.2 2003/03/02 18:27:15 fvdl Exp $ */ /* @@ -207,14 +207,3 @@ i8259_setup(struct pic *pic, struct cpu_info *ci, int pin, int idtvec, int type) if (CPU_IS_PRIMARY(ci)) i8259_reinit_irqs(); } - -unsigned -i8259_setmask(unsigned mask) -{ - unsigned old = i8259_imen; - - i8259_imen = mask; - outb(IO_ICU1 + 1, i8259_imen); - outb(IO_ICU2 + 1, i8259_imen >> 8); - return old; -} diff --git a/sys/arch/amd64/include/i8259.h b/sys/arch/amd64/include/i8259.h index 0a686b99baf..f4c94e0e61f 100644 --- a/sys/arch/amd64/include/i8259.h +++ b/sys/arch/amd64/include/i8259.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: i8259.h,v 1.4 2015/09/02 13:39:23 mikeb Exp $ */ /* $NetBSD: i8259.h,v 1.3 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -46,12 +46,8 @@ * Interrupt "level" mechanism variables, masks, and macros */ extern unsigned i8259_imen; /* interrupt mask enable */ -extern unsigned i8259_setmask(unsigned); - -#define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IO_ICU2 + 1, imen >> 8)) extern void i8259_default_setup(void); -extern void i8259_reinit(void); #endif /* !_LOCORE */ diff --git a/sys/arch/i386/include/i8259.h b/sys/arch/i386/include/i8259.h index e74433925fd..dbf45240a73 100644 --- a/sys/arch/i386/include/i8259.h +++ b/sys/arch/i386/include/i8259.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.h,v 1.6 2015/09/01 12:14:57 mikeb Exp $ */ +/* $OpenBSD: i8259.h,v 1.7 2015/09/02 13:39:23 mikeb Exp $ */ /* $NetBSD: i8259.h,v 1.3 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -46,7 +46,6 @@ * Interrupt "level" mechanism variables, masks, and macros */ extern unsigned imen; /* interrupt mask enable */ -extern unsigned i8259_setmask(unsigned); #define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IO_ICU2 + 1, imen >> 8)) |