d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor DELAYDEBUG as it is only useful for correcting i8254 frequency.

Browse Source
This commit is contained in:
jkim 2011-04-08 19:54:29 +00:00
parent bacffe590f
commit 096c7a804f
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/x86/isa/clock.c
View File

@ -245,6 +245,7 @@ getit(void)
return ((high << 8) | low);
}
#ifndef DELAYDEBUG
static __inline void
delay_tsc(int n, uint64_t freq)
{
@ -280,6 +281,7 @@ delay_timecounter(struct timecounter *tc, int n)
last = u;
} while (now < end);
}
#endif
/*
* Wait "n" microseconds.
@ -289,15 +291,23 @@ delay_timecounter(struct timecounter *tc, int n)
void
DELAY(int n)
{
struct timecounter *tc;
uint64_t freq;
int delta, prev_tick, tick, ticks_left;
#ifdef DELAYDEBUG
int getit_calls = 1;
int n1;
static int state = 0;
#endif
if (state == 0) {
state = 1;
for (n1 = 1; n1 <= 10000000; n1 *= 10)
DELAY(n1);
state = 2;
}
if (state == 1)
printf("DELAY(%d)...", n);
#else
struct timecounter *tc;
uint64_t freq;
freq = atomic_load_acq_64(&tsc_freq);
if (freq != 0) {
@ -309,15 +319,6 @@ DELAY(int n)
delay_timecounter(tc, n);
return;
}
#ifdef DELAYDEBUG
if (state == 0) {
state = 1;
for (n1 = 1; n1 <= 10000000; n1 *= 10)
DELAY(n1);
state = 2;
}
if (state == 1)
printf("DELAY(%d)...", n);
#endif
/*
* Read the counter first, so that the rest of the setup overhead is