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

remove opt_smp.h, minor style police

Browse Source
This commit is contained in:
Peter Wemm 1997-05-29 04:55:39 +00:00
parent 8f453f3ed3
commit 6b19c20ba5
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/amd64/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.84 1997/05/05 22:56:13 fsmp Exp $
* $Id: isa.c,v 1.85 1997/05/26 14:42:24 se Exp $
*/
/*
@ -48,7 +48,6 @@
*/
#include "opt_auto_eoi.h"
#include "opt_smp.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -566,20 +565,20 @@ config_isadev_c(isdp, mp, reconfig)
(*dp->attach)(isdp);
if (isdp->id_irq) {
#if defined(APIC_IO)
/*
* Some motherboards use upper IRQs for traditional
* ISA INTerrupt sources. In particular we have
* seen the secondary IDE connected to IRQ20.
* This code detects and fixes this situation.
*/
/*
* Some motherboards use upper IRQs for traditional
* ISA INTerrupt sources. In particular we have
* seen the secondary IDE connected to IRQ20.
* This code detects and fixes this situation.
*/
u_int apic_mask;
int rirq;
apic_mask = get_isa_apic_mask( isdp->id_irq );
if ( apic_mask != isdp->id_irq ) {
rirq = ffs( isdp->id_irq ) - 1;
apic_mask = get_isa_apic_mask(isdp->id_irq);
if (apic_mask != isdp->id_irq) {
rirq = ffs(isdp->id_irq) - 1;
isdp->id_irq = apic_mask;
undirect_isa_irq( rirq ); /* free for ISA */
undirect_isa_irq(rirq); /* free for ISA */
}
#endif /* APIC_IO */
register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,

23
sys/i386/isa/isa.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.84 1997/05/05 22:56:13 fsmp Exp $
* $Id: isa.c,v 1.85 1997/05/26 14:42:24 se Exp $
*/
/*
@ -48,7 +48,6 @@
*/
#include "opt_auto_eoi.h"
#include "opt_smp.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -566,20 +565,20 @@ config_isadev_c(isdp, mp, reconfig)
(*dp->attach)(isdp);
if (isdp->id_irq) {
#if defined(APIC_IO)
/*
* Some motherboards use upper IRQs for traditional
* ISA INTerrupt sources. In particular we have
* seen the secondary IDE connected to IRQ20.
* This code detects and fixes this situation.
*/
/*
* Some motherboards use upper IRQs for traditional
* ISA INTerrupt sources. In particular we have
* seen the secondary IDE connected to IRQ20.
* This code detects and fixes this situation.
*/
u_int apic_mask;
int rirq;
apic_mask = get_isa_apic_mask( isdp->id_irq );
if ( apic_mask != isdp->id_irq ) {
rirq = ffs( isdp->id_irq ) - 1;
apic_mask = get_isa_apic_mask(isdp->id_irq);
if (apic_mask != isdp->id_irq) {
rirq = ffs(isdp->id_irq) - 1;
isdp->id_irq = apic_mask;
undirect_isa_irq( rirq ); /* free for ISA */
undirect_isa_irq(rirq); /* free for ISA */
}
#endif /* APIC_IO */
register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,