d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate <machine/interruptvar.h> as it has only a single

Browse Source 
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)
This commit is contained in:
Marcel Moolenaar 2007-08-07 23:33:35 +00:00
parent 210b8123c3
commit 4f5d8660e5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=171785
5 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/powerpc/aim/interrupt.c
View File

@ -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

34
sys/powerpc/include/interruptvar.h
View File

@ -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_ */

3
sys/powerpc/include/intr_machdep.h
View File

@ -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,

3
sys/powerpc/powerpc/interrupt.c
View File

@ -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

1
sys/powerpc/powerpc/intr_machdep.c
View File

@ -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>