37c37
< * $Id: clock.c,v 1.97 1997/07/22 20:12:04 fsmp Exp $
---
> * $Id: clock.c,v 1.8 1997/08/21 04:51:12 smp Exp smp $
69d68
< #include <machine/smptests.h> /** NEW_STRATEGY (,SMP_TIMER_NC) */
76a76,78
> #include <i386/isa/intr_machdep.h>
> #include <sys/interrupt.h>
>
862,866d863
< #ifdef NEW_STRATEGY
< #ifdef SMP_TIMER_NC
< #error 'options SMP_TIMER_NC' no longer used, remove & reconfig.
< #endif /** XXX SMP_TIMER_NC */
<
900,926d896
< #else /** NEW_STRATEGY */
<
< /* 8254 is traditionally on ISA IRQ0 */
< #if defined(SMP_TIMER_NC)
< x = -1;
< #else
< x = isa_apic_pin(0);
< #endif /** XXX SMP_TIMER_NC */
<
< if (x < 0) {
< /* bummer, attempt to redirect thru the 8259 */
< if (bootverbose)
< printf("APIC missing 8254 connection\n");
<
< /* allow 8254 timer to INTerrupt 8259 */
< x = inb(IO_ICU1 + 1); /* current mask in 8259 */
< x &= ~1; /* clear 8254 timer mask */
< outb(IO_ICU1 + 1, x); /* write new mask */
<
< /* program IO APIC for type 3 INT on INT0 */
< if (ext_int_setup(0, 0) < 0)
< panic("8254 redirect impossible!");
< x = 0; /* 8259 is on 0 */
< }
<
< #endif /** NEW_STRATEGY */
<
968a939
>
971a943
>