Minor cleanup.

This commit is contained in:
fsmp 1997-07-20 18:02:59 +00:00
parent dc3b7dcdf4
commit 9110fe62af
5 changed files with 40 additions and 55 deletions

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * 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 #ifdef APIC_IO
/* XXX FIXME: from icu.s: */ /* XXX FIXME: from icu.s: */
#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC)
extern u_int ivectors[]; extern u_int ivectors[];
extern u_int vec[]; extern u_int vec[];
#endif
#ifndef APIC_PIN0_TIMER
extern void vec8254 __P((void)); extern void vec8254 __P((void));
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
#endif /* APIC_PIN0_TIMER */
#ifdef DO_RTC_VEC #ifdef DO_RTC_VEC
/** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */
extern void vecRTC __P((void)); extern void vecRTC __P((void));
extern u_int XintrRTC; extern u_int XintrRTC;
extern u_int maskRTC; extern u_int maskRTC;
#endif /* DO_RTC_VEC */ #endif /* DO_RTC_VEC */
#endif /* APIC_IO */ #endif /* APIC_IO */
/* /*
@ -989,16 +996,6 @@ cpu_initclocks()
#endif /* APIC_IO */ #endif /* APIC_IO */
writertc(RTC_STATUSB, rtc_statusb); 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 void

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * 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 #ifdef APIC_IO
/* XXX FIXME: from icu.s: */ /* XXX FIXME: from icu.s: */
#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC)
extern u_int ivectors[]; extern u_int ivectors[];
extern u_int vec[]; extern u_int vec[];
#endif
#ifndef APIC_PIN0_TIMER
extern void vec8254 __P((void)); extern void vec8254 __P((void));
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
#endif /* APIC_PIN0_TIMER */
#ifdef DO_RTC_VEC #ifdef DO_RTC_VEC
/** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */
extern void vecRTC __P((void)); extern void vecRTC __P((void));
extern u_int XintrRTC; extern u_int XintrRTC;
extern u_int maskRTC; extern u_int maskRTC;
#endif /* DO_RTC_VEC */ #endif /* DO_RTC_VEC */
#endif /* APIC_IO */ #endif /* APIC_IO */
/* /*
@ -989,16 +996,6 @@ cpu_initclocks()
#endif /* APIC_IO */ #endif /* APIC_IO */
writertc(RTC_STATUSB, rtc_statusb); 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 void

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * 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 #ifdef APIC_IO
/* XXX FIXME: from icu.s: */ /* XXX FIXME: from icu.s: */
#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC)
extern u_int ivectors[]; extern u_int ivectors[];
extern u_int vec[]; extern u_int vec[];
#endif
#ifndef APIC_PIN0_TIMER
extern void vec8254 __P((void)); extern void vec8254 __P((void));
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
#endif /* APIC_PIN0_TIMER */
#ifdef DO_RTC_VEC #ifdef DO_RTC_VEC
/** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */
extern void vecRTC __P((void)); extern void vecRTC __P((void));
extern u_int XintrRTC; extern u_int XintrRTC;
extern u_int maskRTC; extern u_int maskRTC;
#endif /* DO_RTC_VEC */ #endif /* DO_RTC_VEC */
#endif /* APIC_IO */ #endif /* APIC_IO */
/* /*
@ -989,16 +996,6 @@ cpu_initclocks()
#endif /* APIC_IO */ #endif /* APIC_IO */
writertc(RTC_STATUSB, rtc_statusb); 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 void

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * 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 #ifdef APIC_IO
/* XXX FIXME: from icu.s: */ /* XXX FIXME: from icu.s: */
#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC)
extern u_int ivectors[]; extern u_int ivectors[];
extern u_int vec[]; extern u_int vec[];
#endif
#ifndef APIC_PIN0_TIMER
extern void vec8254 __P((void)); extern void vec8254 __P((void));
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
#endif /* APIC_PIN0_TIMER */
#ifdef DO_RTC_VEC #ifdef DO_RTC_VEC
/** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */
extern void vecRTC __P((void)); extern void vecRTC __P((void));
extern u_int XintrRTC; extern u_int XintrRTC;
extern u_int maskRTC; extern u_int maskRTC;
#endif /* DO_RTC_VEC */ #endif /* DO_RTC_VEC */
#endif /* APIC_IO */ #endif /* APIC_IO */
/* /*
@ -989,16 +996,6 @@ cpu_initclocks()
#endif /* APIC_IO */ #endif /* APIC_IO */
writertc(RTC_STATUSB, rtc_statusb); 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 void

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * 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 #ifdef APIC_IO
/* XXX FIXME: from icu.s: */ /* XXX FIXME: from icu.s: */
#if !defined(APIC_PIN0_TIMER) || defined(DO_RTC_VEC)
extern u_int ivectors[]; extern u_int ivectors[];
extern u_int vec[]; extern u_int vec[];
#endif
#ifndef APIC_PIN0_TIMER
extern void vec8254 __P((void)); extern void vec8254 __P((void));
extern u_int Xintr8254; extern u_int Xintr8254;
extern u_int mask8254; extern u_int mask8254;
#endif /* APIC_PIN0_TIMER */
#ifdef DO_RTC_VEC #ifdef DO_RTC_VEC
/** XXX FIXME: remove vevRTS stuff after several weeks of no problems */ /** XXX FIXME: remove vevRTS stuff after several weeks of no problems */
extern void vecRTC __P((void)); extern void vecRTC __P((void));
extern u_int XintrRTC; extern u_int XintrRTC;
extern u_int maskRTC; extern u_int maskRTC;
#endif /* DO_RTC_VEC */ #endif /* DO_RTC_VEC */
#endif /* APIC_IO */ #endif /* APIC_IO */
/* /*
@ -989,16 +996,6 @@ cpu_initclocks()
#endif /* APIC_IO */ #endif /* APIC_IO */
writertc(RTC_STATUSB, rtc_statusb); 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 void