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

Back out my changes with 'conflicts' keyword for IRQs,

Browse Source 
sounddriver fixed now.
This commit is contained in:
ache 1997-07-09 17:58:16 +00:00
parent ff033633da
commit 7d8d720ba6
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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.2 1997/06/25 20:12:23 smp Exp smp $
* $Id: isa.c,v 1.93 1997/06/25 21:00:00 fsmp Exp $
*/
/*
@ -537,14 +537,9 @@ config_isadev_c(isdp, mp, reconfig)
undirect_isa_irq(rirq); /* free for ISA */
}
#endif /* APIC_IO */
if (!isdp->id_conflicts
|| (!intr_registered(ffs(isdp->id_irq) - 1)
&& isdp->id_intr != NULL))
register_intr(ffs(isdp->id_irq) - 1,
isdp->id_id,
isdp->id_ri_flags,
isdp->id_intr,
mp, isdp->id_unit);
register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,
isdp->id_ri_flags, isdp->id_intr,
mp, isdp->id_unit);
}
} else {
if (isdp->id_reconfig) {

13
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.2 1997/06/25 20:12:23 smp Exp smp $
* $Id: isa.c,v 1.93 1997/06/25 21:00:00 fsmp Exp $
*/
/*
@ -537,14 +537,9 @@ config_isadev_c(isdp, mp, reconfig)
undirect_isa_irq(rirq); /* free for ISA */
}
#endif /* APIC_IO */
if (!isdp->id_conflicts
|| (!intr_registered(ffs(isdp->id_irq) - 1)
&& isdp->id_intr != NULL))
register_intr(ffs(isdp->id_irq) - 1,
isdp->id_id,
isdp->id_ri_flags,
isdp->id_intr,
mp, isdp->id_unit);
register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,
isdp->id_ri_flags, isdp->id_intr,
mp, isdp->id_unit);
}
} else {
if (isdp->id_reconfig) {