diff options
| author | kato <kato@FreeBSD.org> | 1997-07-23 11:28:39 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-07-23 11:28:39 +0000 |
| commit | c6ab590e3bba3c83c0e019c50213543fa65619a6 (patch) | |
| tree | ed16e33cbace5a386a1273ba39ebcc2da36bfb15 /sys/pc98/cbus/clock.c | |
| parent | 20bf9a3e17f37610c163d246680f2ee4880b02fe (diff) | |
| download | FreeBSD-src-c6ab590e3bba3c83c0e019c50213543fa65619a6.zip FreeBSD-src-c6ab590e3bba3c83c0e019c50213543fa65619a6.tar.gz | |
Synchronize with sys/i386/isa/clock.c revision up to 1.97.
Diffstat (limited to 'sys/pc98/cbus/clock.c')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 532701c..1d095be 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.28 1997/07/20 11:55:52 kato Exp $ + * $Id: clock.c,v 1.29 1997/07/21 13:12:01 kato Exp $ */ /* @@ -1131,33 +1131,6 @@ resettodr() #endif } -#ifdef APIC_IO - -/* XXX FIXME: from icu.s: */ -#ifdef NEW_STRATEGY - -extern u_int ivectors[]; -extern u_int vec[]; -extern void vec8254 __P((void)); -extern u_int Xintr8254; -extern u_int mask8254; - -#else /** NEW_STRATEGY */ - -#if !defined(APIC_PIN0_TIMER) -extern u_int ivectors[]; -extern u_int vec[]; -#endif - -#ifndef APIC_PIN0_TIMER -extern void vec8254 __P((void)); -extern u_int Xintr8254; -extern u_int mask8254; -#endif /* APIC_PIN0_TIMER */ - -#endif /** NEW_STRATEGY */ - -#endif /* APIC_IO */ /* * Start both clocks running. @@ -1255,7 +1228,7 @@ cpu_initclocks() register_intr(/* irq */ 0, /* XXX id */ 0, /* flags */ 0, /* XXX */ (inthand2_t *)clkintr, &clk_imask, /* unit */ 0); - INTREN(IRQ0); + INTREN(APIC_IRQ0); #else /* APIC_PIN0_TIMER */ /* 8254 is traditionally on ISA IRQ0 */ if ((x = isa_apic_pin(0)) < 0) { @@ -1332,7 +1305,11 @@ cpu_initclocks() register_intr(/* irq */ 8, /* XXX id */ 1, /* flags */ 0, /* XXX */ (inthand2_t *)rtcintr, &stat_imask, /* unit */ 0); +#ifdef APIC_IO + INTREN(APIC_IRQ8); +#else INTREN(IRQ8); +#endif /* APIC_IO */ writertc(RTC_STATUSB, rtc_statusb); #endif /* !PC98 */ |
