diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-04-28 01:08:47 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-04-28 01:08:47 +0000 |
| commit | 7fe1fec71b67bb1233de43bd254abefd6a985888 (patch) | |
| tree | 4bdbd99fbc0e4447440a0a2396840b0ba2586e83 /sys/i386/isa/isa.c | |
| parent | ecd7dfd8280b6257331cea4611ea732750554b87 (diff) | |
| download | FreeBSD-src-7fe1fec71b67bb1233de43bd254abefd6a985888.zip FreeBSD-src-7fe1fec71b67bb1233de43bd254abefd6a985888.tar.gz | |
removed all the TEST_UPPERPRIO crud.
Diffstat (limited to 'sys/i386/isa/isa.c')
| -rw-r--r-- | sys/i386/isa/isa.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 4528e70..e18d73d 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.81 1997/04/26 11:46:00 peter Exp $ + * $Id: isa.c,v 1.82 1997/04/27 21:18:58 fsmp Exp $ */ /* @@ -950,13 +950,8 @@ isa_irq_pending(dvp) struct isa_device *dvp; { /* read APIC IRR containing the 16 ISA INTerrupts */ -#if defined(TEST_UPPERPRIO) - if ((u_int32_t)dvp->id_irq == APIC_IRQ10) - return (int)(apic_base[APIC_IRR2] & 1); - else -#endif /** TEST_UPPERPRIO */ - return ((apic_base[APIC_IRR1] & 0x00ffffff) - & (u_int32_t)dvp->id_irq) ? 1 : 0; + return ((apic_base[APIC_IRR1] & 0x00ffffff) + & (u_int32_t)dvp->id_irq) ? 1 : 0; } /* @@ -1048,24 +1043,9 @@ register_intr(intr, device_id, flags, handler, maskptr, unit) intr_mptr[intr] = maskptr; intr_mask[intr] = mask | (1 << intr); intr_unit[intr] = unit; -#if defined(TEST_UPPERPRIO) - if (intr == 10) { - printf("--- setting IRQ10 to IDT64\n"); - setidt(64, - flags & RI_FAST ? fastintr[intr] : slowintr[intr], - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - } - else { - printf("setting IRQ%02d to IDT%02d\n", intr, ICU_OFFSET+intr); - setidt(ICU_OFFSET + intr, - flags & RI_FAST ? fastintr[intr] : slowintr[intr], - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - } -#else setidt(ICU_OFFSET + intr, flags & RI_FAST ? fastintr[intr] : slowintr[intr], SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); -#endif /** TEST_UPPERPRIO */ write_eflags(ef); for (cp = intrnames, id = 0; id <= device_id; id++) while (*cp++ != '\0') |
