diff options
author | fsmp <fsmp@FreeBSD.org> | 1997-07-20 18:02:59 +0000 |
---|---|---|
committer | fsmp <fsmp@FreeBSD.org> | 1997-07-20 18:02:59 +0000 |
commit | de88b06b3a40580e5a31ff1b32fea96329c71e88 (patch) | |
tree | 0564e665275650842018f5ce26c3d57c9af58b6b /sys | |
parent | 49f5b902b477bcd78ccd65e4f0aa91ce177cb227 (diff) | |
download | FreeBSD-src-de88b06b3a40580e5a31ff1b32fea96329c71e88.zip FreeBSD-src-de88b06b3a40580e5a31ff1b32fea96329c71e88.tar.gz |
Minor cleanup.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/tsc.c | 19 | ||||
-rw-r--r-- | sys/amd64/isa/clock.c | 19 | ||||
-rw-r--r-- | sys/i386/i386/tsc.c | 19 | ||||
-rw-r--r-- | sys/i386/isa/clock.c | 19 | ||||
-rw-r--r-- | sys/isa/atrtc.c | 19 |
5 files changed, 40 insertions, 55 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 6277477..00fefc3 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ + * $Id: clock.c,v 1.2 1997/07/20 17:02:32 smp Exp smp $ */ /* @@ -830,19 +830,26 @@ resettodr() } #ifdef APIC_IO + /* XXX FIXME: from icu.s: */ +#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC) 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 */ + #ifdef DO_RTC_VEC /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ extern void vecRTC __P((void)); extern u_int XintrRTC; extern u_int maskRTC; #endif /* DO_RTC_VEC */ + #endif /* APIC_IO */ /* @@ -989,16 +996,6 @@ cpu_initclocks() #endif /* APIC_IO */ writertc(RTC_STATUSB, rtc_statusb); - -#ifdef APIC_IO - if (bootverbose) { - printf("SMP: enabled INTs: "); - for (x = 0; x < 24; ++x) - if ((imen & (1 << x)) == 0) - printf("%d, ", x); - printf("imen: 0x%08x\n", imen); - } -#endif /* APIC_IO */ } void diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 6277477..00fefc3 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ + * $Id: clock.c,v 1.2 1997/07/20 17:02:32 smp Exp smp $ */ /* @@ -830,19 +830,26 @@ resettodr() } #ifdef APIC_IO + /* XXX FIXME: from icu.s: */ +#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC) 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 */ + #ifdef DO_RTC_VEC /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ extern void vecRTC __P((void)); extern u_int XintrRTC; extern u_int maskRTC; #endif /* DO_RTC_VEC */ + #endif /* APIC_IO */ /* @@ -989,16 +996,6 @@ cpu_initclocks() #endif /* APIC_IO */ writertc(RTC_STATUSB, rtc_statusb); - -#ifdef APIC_IO - if (bootverbose) { - printf("SMP: enabled INTs: "); - for (x = 0; x < 24; ++x) - if ((imen & (1 << x)) == 0) - printf("%d, ", x); - printf("imen: 0x%08x\n", imen); - } -#endif /* APIC_IO */ } void diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 6277477..00fefc3 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ + * $Id: clock.c,v 1.2 1997/07/20 17:02:32 smp Exp smp $ */ /* @@ -830,19 +830,26 @@ resettodr() } #ifdef APIC_IO + /* XXX FIXME: from icu.s: */ +#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC) 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 */ + #ifdef DO_RTC_VEC /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ extern void vecRTC __P((void)); extern u_int XintrRTC; extern u_int maskRTC; #endif /* DO_RTC_VEC */ + #endif /* APIC_IO */ /* @@ -989,16 +996,6 @@ cpu_initclocks() #endif /* APIC_IO */ writertc(RTC_STATUSB, rtc_statusb); - -#ifdef APIC_IO - if (bootverbose) { - printf("SMP: enabled INTs: "); - for (x = 0; x < 24; ++x) - if ((imen & (1 << x)) == 0) - printf("%d, ", x); - printf("imen: 0x%08x\n", imen); - } -#endif /* APIC_IO */ } void diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 6277477..00fefc3 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ + * $Id: clock.c,v 1.2 1997/07/20 17:02:32 smp Exp smp $ */ /* @@ -830,19 +830,26 @@ resettodr() } #ifdef APIC_IO + /* XXX FIXME: from icu.s: */ +#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC) 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 */ + #ifdef DO_RTC_VEC /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ extern void vecRTC __P((void)); extern u_int XintrRTC; extern u_int maskRTC; #endif /* DO_RTC_VEC */ + #endif /* APIC_IO */ /* @@ -989,16 +996,6 @@ cpu_initclocks() #endif /* APIC_IO */ writertc(RTC_STATUSB, rtc_statusb); - -#ifdef APIC_IO - if (bootverbose) { - printf("SMP: enabled INTs: "); - for (x = 0; x < 24; ++x) - if ((imen & (1 << x)) == 0) - printf("%d, ", x); - printf("imen: 0x%08x\n", imen); - } -#endif /* APIC_IO */ } void diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 6277477..00fefc3 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.92 1997/07/19 03:59:28 fsmp Exp $ + * $Id: clock.c,v 1.2 1997/07/20 17:02:32 smp Exp smp $ */ /* @@ -830,19 +830,26 @@ resettodr() } #ifdef APIC_IO + /* XXX FIXME: from icu.s: */ +#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC) 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 */ + #ifdef DO_RTC_VEC /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ extern void vecRTC __P((void)); extern u_int XintrRTC; extern u_int maskRTC; #endif /* DO_RTC_VEC */ + #endif /* APIC_IO */ /* @@ -989,16 +996,6 @@ cpu_initclocks() #endif /* APIC_IO */ writertc(RTC_STATUSB, rtc_statusb); - -#ifdef APIC_IO - if (bootverbose) { - printf("SMP: enabled INTs: "); - for (x = 0; x < 24; ++x) - if ((imen & (1 << x)) == 0) - printf("%d, ", x); - printf("imen: 0x%08x\n", imen); - } -#endif /* APIC_IO */ } void |