diff options
author | Marcel Moolenaar <marcel@FreeBSD.org> | 2007-08-07 23:33:35 +0000 |
---|---|---|
committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2007-08-07 23:33:35 +0000 |
commit | 4f5d8660e566b568e03bcf91c9b1368b7836b089 (patch) | |
tree | 9ba6ba9149c96987607676419c4cd47298abb30e | |
parent | 210b8123c3819dbe5991e116ccac0f615e63b0fc (diff) | |
download | src-4f5d8660e566b568e03bcf91c9b1368b7836b089.tar.gz src-4f5d8660e566b568e03bcf91c9b1368b7836b089.zip |
Eliminate <machine/interruptvar.h> as it has only a single
prototype. In the future that prototype will not be needed
at all anyway, but for now it's moved to intr_machdep.h.
Approved by: re (blanket)
Notes
Notes:
svn path=/head/; revision=171785
-rw-r--r-- | sys/powerpc/aim/interrupt.c | 3 | ||||
-rw-r--r-- | sys/powerpc/include/interruptvar.h | 34 | ||||
-rw-r--r-- | sys/powerpc/include/intr_machdep.h | 3 | ||||
-rw-r--r-- | sys/powerpc/powerpc/interrupt.c | 3 | ||||
-rw-r--r-- | sys/powerpc/powerpc/intr_machdep.c | 1 |
5 files changed, 5 insertions, 39 deletions
diff --git a/sys/powerpc/aim/interrupt.c b/sys/powerpc/aim/interrupt.c index 04a450678d5d..4b1a97a19138 100644 --- a/sys/powerpc/aim/interrupt.c +++ b/sys/powerpc/aim/interrupt.c @@ -52,12 +52,12 @@ #include <machine/db_machdep.h> #include <machine/fpu.h> #include <machine/frame.h> +#include <machine/intr_machdep.h> #include <machine/pcb.h> #include <machine/psl.h> #include <machine/trap.h> #include <machine/spr.h> #include <machine/sr.h> -#include <machine/interruptvar.h> void powerpc_interrupt(struct trapframe *); @@ -73,7 +73,6 @@ ext_intr_install(void (*new_extint)(void)) } extern void decr_intr(struct trapframe *); -extern void trap(struct trapframe *); /* * A very short dispatch, to try and maximise assembler code use diff --git a/sys/powerpc/include/interruptvar.h b/sys/powerpc/include/interruptvar.h deleted file mode 100644 index 3a8a4824e712..000000000000 --- a/sys/powerpc/include/interruptvar.h +++ /dev/null @@ -1,34 +0,0 @@ -/*- - * Copyright (c) 2002 Peter Grehan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_INTERRUPTVAR_H_ -#define _MACHINE_INTERRUPTVAR_H_ - -void ext_intr_install(void (*new_extint)(void)); - -#endif /* _MACHINE_INTERRUPTVAR_H_ */ diff --git a/sys/powerpc/include/intr_machdep.h b/sys/powerpc/include/intr_machdep.h index 6c9778a2594c..991496527b6c 100644 --- a/sys/powerpc/include/intr_machdep.h +++ b/sys/powerpc/include/intr_machdep.h @@ -43,6 +43,9 @@ struct ppc_intr_handler { u_long *ih_straycount; }; +/* XXX temporary. */ +void ext_intr_install(void (*new_extint)(void)); + void intr_init(void (*)(void), int, void (*)(uintptr_t), void (*)(uintptr_t)); void intr_setup(u_int, ih_func_t *, void *, u_int); int inthand_add(const char *, u_int, driver_filter_t *filter, diff --git a/sys/powerpc/powerpc/interrupt.c b/sys/powerpc/powerpc/interrupt.c index 04a450678d5d..4b1a97a19138 100644 --- a/sys/powerpc/powerpc/interrupt.c +++ b/sys/powerpc/powerpc/interrupt.c @@ -52,12 +52,12 @@ #include <machine/db_machdep.h> #include <machine/fpu.h> #include <machine/frame.h> +#include <machine/intr_machdep.h> #include <machine/pcb.h> #include <machine/psl.h> #include <machine/trap.h> #include <machine/spr.h> #include <machine/sr.h> -#include <machine/interruptvar.h> void powerpc_interrupt(struct trapframe *); @@ -73,7 +73,6 @@ ext_intr_install(void (*new_extint)(void)) } extern void decr_intr(struct trapframe *); -extern void trap(struct trapframe *); /* * A very short dispatch, to try and maximise assembler code use diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c index 287df911232a..1b0ff9427eff 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -75,7 +75,6 @@ #include <sys/proc.h> #include <machine/frame.h> -#include <machine/interruptvar.h> #include <machine/intr_machdep.h> #include <machine/trap.h> |