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

Rename timer0_max_count to i8254_max_count.

Browse Source 
Rename timer0_real_max_count to i8254_real_max_count and make it static.
Rename timer_freq to i8254_freq and make it a loader tunable.
This commit is contained in:
phk 2008-03-26 15:03:24 +00:00
parent 44bfb30efd
commit 632e5d39f7
12 changed files with 258 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/prof_machdep.c
View File

@ -258,7 +258,7 @@ cputime()
delta = prev_count - count;
prev_count = count;
if ((int) delta <= 0)
return (delta + (timer0_max_count << CPUTIME_CLOCK_I8254_SHIFT));
return (delta + (i8254_max_count << CPUTIME_CLOCK_I8254_SHIFT));
return (delta);
}
@ -323,7 +323,7 @@ startguprof(gp)
cputime_clock = CPUTIME_CLOCK_TSC;
#endif
}
gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT;
gp->profrate = i8254_freq << CPUTIME_CLOCK_I8254_SHIFT;
#if defined(I586_CPU) || defined(I686_CPU)
if (cputime_clock == CPUTIME_CLOCK_TSC) {
gp->profrate = tsc_freq >> 1;

4
sys/amd64/include/clock.h
View File

@ -16,8 +16,8 @@
*/
extern int clkintr_pending;
extern int statclock_disable;
extern u_int timer_freq;
extern int timer0_max_count;
extern u_int i8254_freq;
extern int i8254_max_count;
extern uint64_t tsc_freq;
extern int tsc_is_broken;

93
sys/amd64/isa/clock.c
View File

@ -94,18 +94,19 @@ __FBSDID("$FreeBSD$");
#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0)
#define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31)
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
#define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x))
int clkintr_pending;
static int pscnt = 1;
static int psdiv = 1;
static int pscnt = 1;
static int psdiv = 1;
int statclock_disable;
#ifndef TIMER_FREQ
#define TIMER_FREQ 1193182
#endif
u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
int timer0_real_max_count;
u_int i8254_freq = TIMER_FREQ;
TUNABLE_INT("hw.i8254.freq", &i8254_freq);
int i8254_max_count;
static int i8254_real_max_count;
#define RTC_LOCK mtx_lock_spin(&clock_lock)
#define RTC_UNLOCK mtx_unlock_spin(&clock_lock)
@ -132,7 +133,7 @@ static u_char timer2_state;
static unsigned i8254_get_timecount(struct timecounter *tc);
static unsigned i8254_simple_get_timecount(struct timecounter *tc);
static void set_timer_freq(u_int freq, int intr_freq);
static void set_i8254_freq(u_int freq, int intr_freq);
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
@ -152,7 +153,7 @@ clkintr(struct trapframe *frame)
if (i8254_ticked)
i8254_ticked = 0;
else {
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
i8254_lastcount = 0;
}
clkintr_pending = 0;
@ -265,7 +266,7 @@ getit(void)
/*
* Wait "n" microseconds.
* Relies on timer 1 counting down from (timer_freq / hz)
* Relies on timer 1 counting down from (i8254_freq / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@ -322,7 +323,7 @@ DELAY(int n)
prev_tick = getit();
n -= 0; /* XXX actually guess no initial overhead */
/*
* Calculate (n * (timer_freq / 1e6)) without using floating point
* Calculate (n * (i8254_freq / 1e6)) without using floating point
* and without any avoidable overflows.
*/
if (n <= 0)
@ -342,7 +343,7 @@ DELAY(int n)
* division, since even the slow way will complete long
* before the delay is up (unless we're interrupted).
*/
ticks_left = ((u_int)n * (long long)timer_freq + 999999)
ticks_left = ((u_int)n * (long long)i8254_freq + 999999)
/ 1000000;
while (ticks_left > 0) {
@ -351,7 +352,7 @@ DELAY(int n)
inb(0x84);
tick = prev_tick - 1;
if (tick <= 0)
tick = timer0_max_count;
tick = i8254_max_count;
} else
#endif
tick = getit();
@ -361,11 +362,11 @@ DELAY(int n)
delta = prev_tick - tick;
prev_tick = tick;
if (delta < 0) {
delta += timer0_max_count;
delta += i8254_max_count;
/*
* Guard against timer0_max_count being wrong.
* Guard against i8254_max_count being wrong.
* This shouldn't happen in normal operation,
* but it may happen if set_timer_freq() is
* but it may happen if set_i8254_freq() is
* traced.
*/
if (delta < 0)
@ -492,7 +493,7 @@ calibrate_clocks(void)
/* Start keeping track of the i8254 counter. */
prev_count = getit();
if (prev_count == 0 || prev_count > timer0_max_count)
if (prev_count == 0 || prev_count > i8254_max_count)
goto fail;
tot_count = 0;
@ -511,10 +512,10 @@ calibrate_clocks(void)
if (!(rtcin(RTC_STATUSA) & RTCSA_TUP))
sec = rtcin(RTC_SEC);
count = getit();
if (count == 0 || count > timer0_max_count)
if (count == 0 || count > i8254_max_count)
goto fail;
if (count > prev_count)
tot_count += prev_count - (count - timer0_max_count);
tot_count += prev_count - (count - i8254_max_count);
else
tot_count += prev_count - count;
prev_count = count;
@ -532,31 +533,31 @@ calibrate_clocks(void)
fail:
if (bootverbose)
printf("failed, using default i8254 clock of %u Hz\n",
timer_freq);
return (timer_freq);
i8254_freq);
return (i8254_freq);
}
static void
set_timer_freq(u_int freq, int intr_freq)
set_i8254_freq(u_int freq, int intr_freq)
{
int new_timer0_real_max_count;
int new_i8254_real_max_count;
i8254_timecounter.tc_frequency = freq;
mtx_lock_spin(&clock_lock);
timer_freq = freq;
i8254_freq = freq;
if (using_lapic_timer)
new_timer0_real_max_count = 0x10000;
new_i8254_real_max_count = 0x10000;
else
new_timer0_real_max_count = TIMER_DIV(intr_freq);
if (new_timer0_real_max_count != timer0_real_max_count) {
timer0_real_max_count = new_timer0_real_max_count;
if (timer0_real_max_count == 0x10000)
timer0_max_count = 0xffff;
new_i8254_real_max_count = TIMER_DIV(intr_freq);
if (new_i8254_real_max_count != i8254_real_max_count) {
i8254_real_max_count = new_i8254_real_max_count;
if (i8254_real_max_count == 0x10000)
i8254_max_count = 0xffff;
else
timer0_max_count = timer0_real_max_count;
i8254_max_count = i8254_real_max_count;
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
}
mtx_unlock_spin(&clock_lock);
}
@ -567,7 +568,7 @@ i8254_init(void)
{
mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
void
@ -593,23 +594,23 @@ startrtclock()
* Otherwise use the default, and don't use the calibrated i586
* frequency.
*/
delta = freq > timer_freq ? freq - timer_freq : timer_freq - freq;
if (delta < timer_freq / 100) {
delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
if (delta < i8254_freq / 100) {
#ifndef CLK_USE_I8254_CALIBRATION
if (bootverbose)
printf(
"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
freq = timer_freq;
freq = i8254_freq;
#endif
timer_freq = freq;
i8254_freq = freq;
} else {
if (bootverbose)
printf(
"%d Hz differs from default of %d Hz by more than 1%%\n",
freq, timer_freq);
freq, i8254_freq);
}
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
tc_init(&i8254_timecounter);
init_TSC();
@ -775,7 +776,7 @@ cpu_initclocks()
i8254_timecounter.tc_get_timecount =
i8254_simple_get_timecount;
i8254_timecounter.tc_counter_mask = 0xffff;
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
/* Initialize RTC. */
@ -841,10 +842,10 @@ sysctl_machdep_i8254_freq(SYSCTL_HANDLER_ARGS)
* Use `i8254' instead of `timer' in external names because `timer'
* is is too generic. Should use it everywhere.
*/
freq = timer_freq;
freq = i8254_freq;
error = sysctl_handle_int(oidp, &freq, 0, req);
if (error == 0 && req->newptr != NULL)
set_timer_freq(freq, hz);
set_i8254_freq(freq, hz);
return (error);
}
@ -855,7 +856,7 @@ static unsigned
i8254_simple_get_timecount(struct timecounter *tc)
{
return (timer0_max_count - getit());
return (i8254_max_count - getit());
}
static unsigned
@ -873,13 +874,13 @@ i8254_get_timecount(struct timecounter *tc)
low = inb(TIMER_CNTR0);
high = inb(TIMER_CNTR0);
count = timer0_max_count - ((high << 8) | low);
count = i8254_max_count - ((high << 8) | low);
if (count < i8254_lastcount ||
(!i8254_ticked && (clkintr_pending ||
((count < 20 || (!(rflags & PSL_I) && count < timer0_max_count / 2u)) &&
((count < 20 || (!(rflags & PSL_I) && count < i8254_max_count / 2u)) &&
i8254_pending != NULL && i8254_pending(i8254_intsrc))))) {
i8254_ticked = 1;
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
}
i8254_lastcount = count;
count += i8254_offset;

2
sys/dev/speaker/spkr.c
View File

@ -80,7 +80,7 @@ tone(thz, centisecs)
if (thz <= 0)
return;
divisor = timer_freq / thz;
divisor = i8254_freq / thz;
#ifdef DEBUG
(void) printf("tone: thz=%d centisecs=%d\n", thz, centisecs);

4
sys/i386/include/clock.h
View File

@ -16,8 +16,8 @@
*/
extern int clkintr_pending;
extern int statclock_disable;
extern u_int timer_freq;
extern int timer0_max_count;
extern u_int i8254_freq;
extern int i8254_max_count;
extern uint64_t tsc_freq;
extern int tsc_is_broken;

99
sys/i386/isa/clock.c
View File

@ -97,18 +97,19 @@ __FBSDID("$FreeBSD$");
#include <i386/bios/mca_machdep.h>
#endif
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
#define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x))
int clkintr_pending;
static int pscnt = 1;
static int psdiv = 1;
static int pscnt = 1;
static int psdiv = 1;
int statclock_disable;
#ifndef TIMER_FREQ
#define TIMER_FREQ 1193182
#endif
u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
int timer0_real_max_count;
u_int i8254_freq = TIMER_FREQ;
TUNABLE_INT("hw.i8254.freq", &i8254_freq);
int i8254_max_count;
static int i8254_real_max_count;
#define RTC_LOCK mtx_lock_spin(&clock_lock)
#define RTC_UNLOCK mtx_unlock_spin(&clock_lock)
@ -134,7 +135,7 @@ static u_char timer2_state;
static unsigned i8254_get_timecount(struct timecounter *tc);
static unsigned i8254_simple_get_timecount(struct timecounter *tc);
static void set_timer_freq(u_int freq, int intr_freq);
static void set_i8254_freq(u_int freq, int intr_freq);
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
@ -154,7 +155,7 @@ clkintr(struct trapframe *frame)
if (i8254_ticked)
i8254_ticked = 0;
else {
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
i8254_lastcount = 0;
}
clkintr_pending = 0;
@ -270,7 +271,7 @@ getit(void)
/*
* Wait "n" microseconds.
* Relies on timer 1 counting down from (timer_freq / hz)
* Relies on timer 1 counting down from (i8254_freq / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@ -327,7 +328,7 @@ DELAY(int n)
prev_tick = getit();
n -= 0; /* XXX actually guess no initial overhead */
/*
* Calculate (n * (timer_freq / 1e6)) without using floating point
* Calculate (n * (i8254_freq / 1e6)) without using floating point
* and without any avoidable overflows.
*/
if (n <= 0)
@ -347,7 +348,7 @@ DELAY(int n)
* division, since even the slow way will complete long
* before the delay is up (unless we're interrupted).
*/
ticks_left = ((u_int)n * (long long)timer_freq + 999999)
ticks_left = ((u_int)n * (long long)i8254_freq + 999999)
/ 1000000;
while (ticks_left > 0) {
@ -356,7 +357,7 @@ DELAY(int n)
inb(0x84);
tick = prev_tick - 1;
if (tick <= 0)
tick = timer0_max_count;
tick = i8254_max_count;
} else
#endif
tick = getit();
@ -366,11 +367,11 @@ DELAY(int n)
delta = prev_tick - tick;
prev_tick = tick;
if (delta < 0) {
delta += timer0_max_count;
delta += i8254_max_count;
/*
* Guard against timer0_max_count being wrong.
* Guard against i8254_max_count being wrong.
* This shouldn't happen in normal operation,
* but it may happen if set_timer_freq() is
* but it may happen if set_i8254_freq() is
* traced.
*/
if (delta < 0)
@ -497,7 +498,7 @@ calibrate_clocks(void)
/* Start keeping track of the i8254 counter. */
prev_count = getit();
if (prev_count == 0 || prev_count > timer0_max_count)
if (prev_count == 0 || prev_count > i8254_max_count)
goto fail;
tot_count = 0;
@ -516,10 +517,10 @@ calibrate_clocks(void)
if (!(rtcin(RTC_STATUSA) & RTCSA_TUP))
sec = rtcin(RTC_SEC);
count = getit();
if (count == 0 || count > timer0_max_count)
if (count == 0 || count > i8254_max_count)
goto fail;
if (count > prev_count)
tot_count += prev_count - (count - timer0_max_count);
tot_count += prev_count - (count - i8254_max_count);
else
tot_count += prev_count - count;
prev_count = count;
@ -537,31 +538,31 @@ calibrate_clocks(void)
fail:
if (bootverbose)
printf("failed, using default i8254 clock of %u Hz\n",
timer_freq);
return (timer_freq);
i8254_freq);
return (i8254_freq);
}
static void
set_timer_freq(u_int freq, int intr_freq)
set_i8254_freq(u_int freq, int intr_freq)
{
int new_timer0_real_max_count;
int new_i8254_real_max_count;
i8254_timecounter.tc_frequency = freq;
mtx_lock_spin(&clock_lock);
timer_freq = freq;
i8254_freq = freq;
if (using_lapic_timer)
new_timer0_real_max_count = 0x10000;
new_i8254_real_max_count = 0x10000;
else
new_timer0_real_max_count = TIMER_DIV(intr_freq);
if (new_timer0_real_max_count != timer0_real_max_count) {
timer0_real_max_count = new_timer0_real_max_count;
if (timer0_real_max_count == 0x10000)
timer0_max_count = 0xffff;
new_i8254_real_max_count = TIMER_DIV(intr_freq);
if (new_i8254_real_max_count != i8254_real_max_count) {
i8254_real_max_count = new_i8254_real_max_count;
if (i8254_real_max_count == 0x10000)
i8254_max_count = 0xffff;
else
timer0_max_count = timer0_real_max_count;
i8254_max_count = i8254_real_max_count;
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
}
mtx_unlock_spin(&clock_lock);
}
@ -572,8 +573,8 @@ i8254_restore(void)
mtx_lock_spin(&clock_lock);
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
mtx_unlock_spin(&clock_lock);
}
@ -601,7 +602,7 @@ void
timer_restore(void)
{
i8254_restore(); /* restore timer_freq and hz */
i8254_restore(); /* restore i8254_freq and hz */
rtc_restore(); /* reenable RTC interrupts */
}
@ -611,7 +612,7 @@ i8254_init(void)
{
mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
void
@ -637,23 +638,23 @@ startrtclock()
* Otherwise use the default, and don't use the calibrated i586
* frequency.
*/
delta = freq > timer_freq ? freq - timer_freq : timer_freq - freq;
if (delta < timer_freq / 100) {
delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
if (delta < i8254_freq / 100) {
#ifndef CLK_USE_I8254_CALIBRATION
if (bootverbose)
printf(
"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
freq = timer_freq;
freq = i8254_freq;
#endif
timer_freq = freq;
i8254_freq = freq;
} else {
if (bootverbose)
printf(
"%d Hz differs from default of %d Hz by more than 1%%\n",
freq, timer_freq);
freq, i8254_freq);
}
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
tc_init(&i8254_timecounter);
init_TSC();
@ -779,7 +780,7 @@ cpu_initclocks()
i8254_timecounter.tc_get_timecount =
i8254_simple_get_timecount;
i8254_timecounter.tc_counter_mask = 0xffff;
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
/* Initialize RTC. */
@ -845,10 +846,10 @@ sysctl_machdep_i8254_freq(SYSCTL_HANDLER_ARGS)
* Use `i8254' instead of `timer' in external names because `timer'
* is is too generic. Should use it everywhere.
*/
freq = timer_freq;
freq = i8254_freq;
error = sysctl_handle_int(oidp, &freq, 0, req);
if (error == 0 && req->newptr != NULL)
set_timer_freq(freq, hz);
set_i8254_freq(freq, hz);
return (error);
}
@ -859,7 +860,7 @@ static unsigned
i8254_simple_get_timecount(struct timecounter *tc)
{
return (timer0_max_count - getit());
return (i8254_max_count - getit());
}
static unsigned
@ -877,13 +878,13 @@ i8254_get_timecount(struct timecounter *tc)
low = inb(TIMER_CNTR0);
high = inb(TIMER_CNTR0);
count = timer0_max_count - ((high << 8) | low);
count = i8254_max_count - ((high << 8) | low);
if (count < i8254_lastcount ||
(!i8254_ticked && (clkintr_pending ||
((count < 20 || (!(eflags & PSL_I) && count < timer0_max_count / 2u)) &&
((count < 20 || (!(eflags & PSL_I) && count < i8254_max_count / 2u)) &&
i8254_pending != NULL && i8254_pending(i8254_intsrc))))) {
i8254_ticked = 1;
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
}
i8254_lastcount = count;
count += i8254_offset;

4
sys/i386/isa/prof_machdep.c
View File

@ -228,7 +228,7 @@ cputime()
delta = prev_count - count;
prev_count = count;
if ((int) delta <= 0)
return (delta + (timer0_max_count << CPUTIME_CLOCK_I8254_SHIFT));
return (delta + (i8254_max_count << CPUTIME_CLOCK_I8254_SHIFT));
return (delta);
}
@ -293,7 +293,7 @@ startguprof(gp)
cputime_clock = CPUTIME_CLOCK_TSC;
#endif
}
gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT;
gp->profrate = i8254_freq << CPUTIME_CLOCK_I8254_SHIFT;
#if defined(I586_CPU) || defined(I686_CPU)
if (cputime_clock == CPUTIME_CLOCK_TSC) {
gp->profrate = tsc_freq >> 1;

99
sys/isa/atrtc.c
View File

@ -97,18 +97,19 @@ __FBSDID("$FreeBSD$");
#include <i386/bios/mca_machdep.h>
#endif
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
#define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x))
int clkintr_pending;
static int pscnt = 1;
static int psdiv = 1;
static int pscnt = 1;
static int psdiv = 1;
int statclock_disable;
#ifndef TIMER_FREQ
#define TIMER_FREQ 1193182
#endif
u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
int timer0_real_max_count;
u_int i8254_freq = TIMER_FREQ;
TUNABLE_INT("hw.i8254.freq", &i8254_freq);
int i8254_max_count;
static int i8254_real_max_count;
#define RTC_LOCK mtx_lock_spin(&clock_lock)
#define RTC_UNLOCK mtx_unlock_spin(&clock_lock)
@ -134,7 +135,7 @@ static u_char timer2_state;
static unsigned i8254_get_timecount(struct timecounter *tc);
static unsigned i8254_simple_get_timecount(struct timecounter *tc);
static void set_timer_freq(u_int freq, int intr_freq);
static void set_i8254_freq(u_int freq, int intr_freq);
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
@ -154,7 +155,7 @@ clkintr(struct trapframe *frame)
if (i8254_ticked)
i8254_ticked = 0;
else {
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
i8254_lastcount = 0;
}
clkintr_pending = 0;
@ -270,7 +271,7 @@ getit(void)
/*
* Wait "n" microseconds.
* Relies on timer 1 counting down from (timer_freq / hz)
* Relies on timer 1 counting down from (i8254_freq / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@ -327,7 +328,7 @@ DELAY(int n)
prev_tick = getit();
n -= 0; /* XXX actually guess no initial overhead */
/*
* Calculate (n * (timer_freq / 1e6)) without using floating point
* Calculate (n * (i8254_freq / 1e6)) without using floating point
* and without any avoidable overflows.
*/
if (n <= 0)
@ -347,7 +348,7 @@ DELAY(int n)
* division, since even the slow way will complete long
* before the delay is up (unless we're interrupted).
*/
ticks_left = ((u_int)n * (long long)timer_freq + 999999)
ticks_left = ((u_int)n * (long long)i8254_freq + 999999)
/ 1000000;
while (ticks_left > 0) {
@ -356,7 +357,7 @@ DELAY(int n)
inb(0x84);
tick = prev_tick - 1;
if (tick <= 0)
tick = timer0_max_count;
tick = i8254_max_count;
} else
#endif
tick = getit();
@ -366,11 +367,11 @@ DELAY(int n)
delta = prev_tick - tick;
prev_tick = tick;
if (delta < 0) {
delta += timer0_max_count;
delta += i8254_max_count;
/*
* Guard against timer0_max_count being wrong.
* Guard against i8254_max_count being wrong.
* This shouldn't happen in normal operation,
* but it may happen if set_timer_freq() is
* but it may happen if set_i8254_freq() is
* traced.
*/
if (delta < 0)
@ -497,7 +498,7 @@ calibrate_clocks(void)
/* Start keeping track of the i8254 counter. */
prev_count = getit();
if (prev_count == 0 || prev_count > timer0_max_count)
if (prev_count == 0 || prev_count > i8254_max_count)
goto fail;
tot_count = 0;
@ -516,10 +517,10 @@ calibrate_clocks(void)
if (!(rtcin(RTC_STATUSA) & RTCSA_TUP))
sec = rtcin(RTC_SEC);
count = getit();
if (count == 0 || count > timer0_max_count)
if (count == 0 || count > i8254_max_count)
goto fail;
if (count > prev_count)
tot_count += prev_count - (count - timer0_max_count);
tot_count += prev_count - (count - i8254_max_count);
else
tot_count += prev_count - count;
prev_count = count;
@ -537,31 +538,31 @@ calibrate_clocks(void)
fail:
if (bootverbose)
printf("failed, using default i8254 clock of %u Hz\n",
timer_freq);
return (timer_freq);
i8254_freq);
return (i8254_freq);
}
static void
set_timer_freq(u_int freq, int intr_freq)
set_i8254_freq(u_int freq, int intr_freq)
{
int new_timer0_real_max_count;
int new_i8254_real_max_count;
i8254_timecounter.tc_frequency = freq;
mtx_lock_spin(&clock_lock);
timer_freq = freq;
i8254_freq = freq;
if (using_lapic_timer)
new_timer0_real_max_count = 0x10000;
new_i8254_real_max_count = 0x10000;
else
new_timer0_real_max_count = TIMER_DIV(intr_freq);
if (new_timer0_real_max_count != timer0_real_max_count) {
timer0_real_max_count = new_timer0_real_max_count;
if (timer0_real_max_count == 0x10000)
timer0_max_count = 0xffff;
new_i8254_real_max_count = TIMER_DIV(intr_freq);
if (new_i8254_real_max_count != i8254_real_max_count) {
i8254_real_max_count = new_i8254_real_max_count;
if (i8254_real_max_count == 0x10000)
i8254_max_count = 0xffff;
else
timer0_max_count = timer0_real_max_count;
i8254_max_count = i8254_real_max_count;
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
}
mtx_unlock_spin(&clock_lock);
}
@ -572,8 +573,8 @@ i8254_restore(void)
mtx_lock_spin(&clock_lock);
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
mtx_unlock_spin(&clock_lock);
}
@ -601,7 +602,7 @@ void
timer_restore(void)
{
i8254_restore(); /* restore timer_freq and hz */
i8254_restore(); /* restore i8254_freq and hz */
rtc_restore(); /* reenable RTC interrupts */
}
@ -611,7 +612,7 @@ i8254_init(void)
{
mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
void
@ -637,23 +638,23 @@ startrtclock()
* Otherwise use the default, and don't use the calibrated i586
* frequency.
*/
delta = freq > timer_freq ? freq - timer_freq : timer_freq - freq;
if (delta < timer_freq / 100) {
delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
if (delta < i8254_freq / 100) {
#ifndef CLK_USE_I8254_CALIBRATION
if (bootverbose)
printf(
"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
freq = timer_freq;
freq = i8254_freq;
#endif
timer_freq = freq;
i8254_freq = freq;
} else {
if (bootverbose)
printf(
"%d Hz differs from default of %d Hz by more than 1%%\n",
freq, timer_freq);
freq, i8254_freq);
}
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
tc_init(&i8254_timecounter);
init_TSC();
@ -779,7 +780,7 @@ cpu_initclocks()
i8254_timecounter.tc_get_timecount =
i8254_simple_get_timecount;
i8254_timecounter.tc_counter_mask = 0xffff;
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
/* Initialize RTC. */
@ -845,10 +846,10 @@ sysctl_machdep_i8254_freq(SYSCTL_HANDLER_ARGS)
* Use `i8254' instead of `timer' in external names because `timer'
* is is too generic. Should use it everywhere.
*/
freq = timer_freq;
freq = i8254_freq;
error = sysctl_handle_int(oidp, &freq, 0, req);
if (error == 0 && req->newptr != NULL)
set_timer_freq(freq, hz);
set_i8254_freq(freq, hz);
return (error);
}
@ -859,7 +860,7 @@ static unsigned
i8254_simple_get_timecount(struct timecounter *tc)
{
return (timer0_max_count - getit());
return (i8254_max_count - getit());
}
static unsigned
@ -877,13 +878,13 @@ i8254_get_timecount(struct timecounter *tc)
low = inb(TIMER_CNTR0);
high = inb(TIMER_CNTR0);
count = timer0_max_count - ((high << 8) | low);
count = i8254_max_count - ((high << 8) | low);
if (count < i8254_lastcount ||
(!i8254_ticked && (clkintr_pending ||
((count < 20 || (!(eflags & PSL_I) && count < timer0_max_count / 2u)) &&
((count < 20 || (!(eflags & PSL_I) && count < i8254_max_count / 2u)) &&
i8254_pending != NULL && i8254_pending(i8254_intsrc))))) {
i8254_ticked = 1;
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
}
i8254_lastcount = count;
count += i8254_offset;

2
sys/isa/syscons_isa.c
View File

@ -278,7 +278,7 @@ sc_tone(int herz)
if (timer_spkr_acquire())
return EBUSY;
/* set pitch */
spkr_set_pitch(timer_freq / herz);
spkr_set_pitch(i8254_freq / herz);
/* enable counter 2 output to speaker */
ppi_spkr_on();
} else {

99
sys/pc98/cbus/clock.c
View File

@ -93,16 +93,17 @@ __FBSDID("$FreeBSD$");
#include <isa/isavar.h>
#endif
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
#define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x))
int clkintr_pending;
int statclock_disable;
#ifndef TIMER_FREQ
#define TIMER_FREQ 2457600
#endif
u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
int timer0_real_max_count;
u_int i8254_freq = TIMER_FREQ;
TUNABLE_INT("hw.i8254.freq", &i8254_freq);
int i8254_max_count;
static int i8254_real_max_count;
static int beeping = 0;
static struct mtx clock_lock;
@ -128,7 +129,7 @@ static void rtc_outb(int);
static unsigned i8254_get_timecount(struct timecounter *tc);
static unsigned i8254_simple_get_timecount(struct timecounter *tc);
static void set_timer_freq(u_int freq, int intr_freq);
static void set_i8254_freq(u_int freq, int intr_freq);
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
@ -148,7 +149,7 @@ clkintr(struct trapframe *frame)
if (i8254_ticked)
i8254_ticked = 0;
else {
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
i8254_lastcount = 0;
}
clkintr_pending = 0;
@ -241,7 +242,7 @@ getit(void)
/*
* Wait "n" microseconds.
* Relies on timer 1 counting down from (timer_freq / hz)
* Relies on timer 1 counting down from (i8254_freq / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@ -283,7 +284,7 @@ DELAY(int n)
prev_tick = getit();
n -= 0; /* XXX actually guess no initial overhead */
/*
* Calculate (n * (timer_freq / 1e6)) without using floating point
* Calculate (n * (i8254_freq / 1e6)) without using floating point
* and without any avoidable overflows.
*/
if (n <= 0)
@ -303,7 +304,7 @@ DELAY(int n)
* division, since even the slow way will complete long
* before the delay is up (unless we're interrupted).
*/
ticks_left = ((u_int)n * (long long)timer_freq + 999999)
ticks_left = ((u_int)n * (long long)i8254_freq + 999999)
/ 1000000;
while (ticks_left > 0) {
@ -312,7 +313,7 @@ DELAY(int n)
outb(0x5f, 0);
tick = prev_tick - 1;
if (tick <= 0)
tick = timer0_max_count;
tick = i8254_max_count;
} else
#endif
tick = getit();
@ -322,11 +323,11 @@ DELAY(int n)
delta = prev_tick - tick;
prev_tick = tick;
if (delta < 0) {
delta += timer0_max_count;
delta += i8254_max_count;
/*
* Guard against timer0_max_count being wrong.
* Guard against i8254_max_count being wrong.
* This shouldn't happen in normal operation,
* but it may happen if set_timer_freq() is
* but it may happen if set_i8254_freq() is
* traced.
*/
if (delta < 0)
@ -403,7 +404,7 @@ calibrate_clocks(void)
/* Start keeping track of the i8254 counter. */
prev_count = getit();
if (prev_count == 0 || prev_count > timer0_max_count)
if (prev_count == 0 || prev_count > i8254_max_count)
goto fail;
tot_count = 0;
@ -411,10 +412,10 @@ calibrate_clocks(void)
for (;;) {
sec = inw(0x5e);
count = getit();
if (count == 0 || count > timer0_max_count)
if (count == 0 || count > i8254_max_count)
goto fail;
if (count > prev_count)
tot_count += prev_count - (count - timer0_max_count);
tot_count += prev_count - (count - i8254_max_count);
else
tot_count += prev_count - count;
prev_count = count;
@ -434,31 +435,31 @@ calibrate_clocks(void)
fail:
if (bootverbose)
printf("failed, using default i8254 clock of %u Hz\n",
timer_freq);
return (timer_freq);
i8254_freq);
return (i8254_freq);
}
static void
set_timer_freq(u_int freq, int intr_freq)
set_i8254_freq(u_int freq, int intr_freq)
{
int new_timer0_real_max_count;
int new_i8254_real_max_count;
i8254_timecounter.tc_frequency = freq;
mtx_lock_spin(&clock_lock);
timer_freq = freq;
i8254_freq = freq;
if (using_lapic_timer)
new_timer0_real_max_count = 0x10000;
new_i8254_real_max_count = 0x10000;
else
new_timer0_real_max_count = TIMER_DIV(intr_freq);
if (new_timer0_real_max_count != timer0_real_max_count) {
timer0_real_max_count = new_timer0_real_max_count;
if (timer0_real_max_count == 0x10000)
timer0_max_count = 0xffff;
new_i8254_real_max_count = TIMER_DIV(intr_freq);
if (new_i8254_real_max_count != i8254_real_max_count) {
i8254_real_max_count = new_i8254_real_max_count;
if (i8254_real_max_count == 0x10000)
i8254_max_count = 0xffff;
else
timer0_max_count = timer0_real_max_count;
i8254_max_count = i8254_real_max_count;
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
}
mtx_unlock_spin(&clock_lock);
}
@ -469,8 +470,8 @@ i8254_restore(void)
mtx_lock_spin(&clock_lock);
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
mtx_unlock_spin(&clock_lock);
}
@ -486,7 +487,7 @@ void
timer_restore(void)
{
i8254_restore(); /* restore timer_freq and hz */
i8254_restore(); /* restore i8254_freq and hz */
}
/* This is separate from startrtclock() so that it can be called early. */
@ -497,11 +498,11 @@ i8254_init(void)
mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
if (pc98_machine_type & M_8M)
timer_freq = 1996800L; /* 1.9968 MHz */
i8254_freq = 1996800L; /* 1.9968 MHz */
else
timer_freq = 2457600L; /* 2.4576 MHz */
i8254_freq = 2457600L; /* 2.4576 MHz */
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
void
@ -524,23 +525,23 @@ startrtclock()
* Otherwise use the default, and don't use the calibrated i586
* frequency.
*/
delta = freq > timer_freq ? freq - timer_freq : timer_freq - freq;
if (delta < timer_freq / 100) {
delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
if (delta < i8254_freq / 100) {
#ifndef CLK_USE_I8254_CALIBRATION
if (bootverbose)
printf(
"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
freq = timer_freq;
freq = i8254_freq;
#endif
timer_freq = freq;
i8254_freq = freq;
} else {
if (bootverbose)
printf(
"%d Hz differs from default of %d Hz by more than 1%%\n",
freq, timer_freq);
freq, i8254_freq);
}
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
tc_init(&i8254_timecounter);
init_TSC();
@ -704,7 +705,7 @@ cpu_initclocks()
i8254_timecounter.tc_get_timecount =
i8254_simple_get_timecount;
i8254_timecounter.tc_counter_mask = 0xffff;
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
init_TSC_tc();
@ -730,10 +731,10 @@ sysctl_machdep_i8254_freq(SYSCTL_HANDLER_ARGS)
* Use `i8254' instead of `timer' in external names because `timer'
* is is too generic. Should use it everywhere.
*/
freq = timer_freq;
freq = i8254_freq;
error = sysctl_handle_int(oidp, &freq, 0, req);
if (error == 0 && req->newptr != NULL)
set_timer_freq(freq, hz);
set_i8254_freq(freq, hz);
return (error);
}
@ -744,7 +745,7 @@ static unsigned
i8254_simple_get_timecount(struct timecounter *tc)
{
return (timer0_max_count - getit());
return (i8254_max_count - getit());
}
static unsigned
@ -762,13 +763,13 @@ i8254_get_timecount(struct timecounter *tc)
low = inb(TIMER_CNTR0);
high = inb(TIMER_CNTR0);
count = timer0_max_count - ((high << 8) | low);
count = i8254_max_count - ((high << 8) | low);
if (count < i8254_lastcount ||
(!i8254_ticked && (clkintr_pending ||
((count < 20 || (!(eflags & PSL_I) && count < timer0_max_count / 2u)) &&
((count < 20 || (!(eflags & PSL_I) && count < i8254_max_count / 2u)) &&
i8254_pending != NULL && i8254_pending(i8254_intsrc))))) {
i8254_ticked = 1;
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
}
i8254_lastcount = count;
count += i8254_offset;

99
sys/pc98/cbus/pcrtc.c
View File

@ -93,16 +93,17 @@ __FBSDID("$FreeBSD$");
#include <isa/isavar.h>
#endif
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
#define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x))
int clkintr_pending;
int statclock_disable;
#ifndef TIMER_FREQ
#define TIMER_FREQ 2457600
#endif
u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
int timer0_real_max_count;
u_int i8254_freq = TIMER_FREQ;
TUNABLE_INT("hw.i8254.freq", &i8254_freq);
int i8254_max_count;
static int i8254_real_max_count;
static int beeping = 0;
static struct mtx clock_lock;
@ -128,7 +129,7 @@ static void rtc_outb(int);
static unsigned i8254_get_timecount(struct timecounter *tc);
static unsigned i8254_simple_get_timecount(struct timecounter *tc);
static void set_timer_freq(u_int freq, int intr_freq);
static void set_i8254_freq(u_int freq, int intr_freq);
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
@ -148,7 +149,7 @@ clkintr(struct trapframe *frame)
if (i8254_ticked)
i8254_ticked = 0;
else {
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
i8254_lastcount = 0;
}
clkintr_pending = 0;
@ -241,7 +242,7 @@ getit(void)
/*
* Wait "n" microseconds.
* Relies on timer 1 counting down from (timer_freq / hz)
* Relies on timer 1 counting down from (i8254_freq / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@ -283,7 +284,7 @@ DELAY(int n)
prev_tick = getit();
n -= 0; /* XXX actually guess no initial overhead */
/*
* Calculate (n * (timer_freq / 1e6)) without using floating point
* Calculate (n * (i8254_freq / 1e6)) without using floating point
* and without any avoidable overflows.
*/
if (n <= 0)
@ -303,7 +304,7 @@ DELAY(int n)
* division, since even the slow way will complete long
* before the delay is up (unless we're interrupted).
*/
ticks_left = ((u_int)n * (long long)timer_freq + 999999)
ticks_left = ((u_int)n * (long long)i8254_freq + 999999)
/ 1000000;
while (ticks_left > 0) {
@ -312,7 +313,7 @@ DELAY(int n)
outb(0x5f, 0);
tick = prev_tick - 1;
if (tick <= 0)
tick = timer0_max_count;
tick = i8254_max_count;
} else
#endif
tick = getit();
@ -322,11 +323,11 @@ DELAY(int n)
delta = prev_tick - tick;
prev_tick = tick;
if (delta < 0) {
delta += timer0_max_count;
delta += i8254_max_count;
/*
* Guard against timer0_max_count being wrong.
* Guard against i8254_max_count being wrong.
* This shouldn't happen in normal operation,
* but it may happen if set_timer_freq() is
* but it may happen if set_i8254_freq() is
* traced.
*/
if (delta < 0)
@ -403,7 +404,7 @@ calibrate_clocks(void)
/* Start keeping track of the i8254 counter. */
prev_count = getit();
if (prev_count == 0 || prev_count > timer0_max_count)
if (prev_count == 0 || prev_count > i8254_max_count)
goto fail;
tot_count = 0;
@ -411,10 +412,10 @@ calibrate_clocks(void)
for (;;) {
sec = inw(0x5e);
count = getit();
if (count == 0 || count > timer0_max_count)
if (count == 0 || count > i8254_max_count)
goto fail;
if (count > prev_count)
tot_count += prev_count - (count - timer0_max_count);
tot_count += prev_count - (count - i8254_max_count);
else
tot_count += prev_count - count;
prev_count = count;
@ -434,31 +435,31 @@ calibrate_clocks(void)
fail:
if (bootverbose)
printf("failed, using default i8254 clock of %u Hz\n",
timer_freq);
return (timer_freq);
i8254_freq);
return (i8254_freq);
}
static void
set_timer_freq(u_int freq, int intr_freq)
set_i8254_freq(u_int freq, int intr_freq)
{
int new_timer0_real_max_count;
int new_i8254_real_max_count;
i8254_timecounter.tc_frequency = freq;
mtx_lock_spin(&clock_lock);
timer_freq = freq;
i8254_freq = freq;
if (using_lapic_timer)
new_timer0_real_max_count = 0x10000;
new_i8254_real_max_count = 0x10000;
else
new_timer0_real_max_count = TIMER_DIV(intr_freq);
if (new_timer0_real_max_count != timer0_real_max_count) {
timer0_real_max_count = new_timer0_real_max_count;
if (timer0_real_max_count == 0x10000)
timer0_max_count = 0xffff;
new_i8254_real_max_count = TIMER_DIV(intr_freq);
if (new_i8254_real_max_count != i8254_real_max_count) {
i8254_real_max_count = new_i8254_real_max_count;
if (i8254_real_max_count == 0x10000)
i8254_max_count = 0xffff;
else
timer0_max_count = timer0_real_max_count;
i8254_max_count = i8254_real_max_count;
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
}
mtx_unlock_spin(&clock_lock);
}
@ -469,8 +470,8 @@ i8254_restore(void)
mtx_lock_spin(&clock_lock);
outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
outb(TIMER_CNTR0, timer0_real_max_count & 0xff);
outb(TIMER_CNTR0, timer0_real_max_count >> 8);
outb(TIMER_CNTR0, i8254_real_max_count & 0xff);
outb(TIMER_CNTR0, i8254_real_max_count >> 8);
mtx_unlock_spin(&clock_lock);
}
@ -486,7 +487,7 @@ void
timer_restore(void)
{
i8254_restore(); /* restore timer_freq and hz */
i8254_restore(); /* restore i8254_freq and hz */
}
/* This is separate from startrtclock() so that it can be called early. */
@ -497,11 +498,11 @@ i8254_init(void)
mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
if (pc98_machine_type & M_8M)
timer_freq = 1996800L; /* 1.9968 MHz */
i8254_freq = 1996800L; /* 1.9968 MHz */
else
timer_freq = 2457600L; /* 2.4576 MHz */
i8254_freq = 2457600L; /* 2.4576 MHz */
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
void
@ -524,23 +525,23 @@ startrtclock()
* Otherwise use the default, and don't use the calibrated i586
* frequency.
*/
delta = freq > timer_freq ? freq - timer_freq : timer_freq - freq;
if (delta < timer_freq / 100) {
delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
if (delta < i8254_freq / 100) {
#ifndef CLK_USE_I8254_CALIBRATION
if (bootverbose)
printf(
"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
freq = timer_freq;
freq = i8254_freq;
#endif
timer_freq = freq;
i8254_freq = freq;
} else {
if (bootverbose)
printf(
"%d Hz differs from default of %d Hz by more than 1%%\n",
freq, timer_freq);
freq, i8254_freq);
}
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
tc_init(&i8254_timecounter);
init_TSC();
@ -704,7 +705,7 @@ cpu_initclocks()
i8254_timecounter.tc_get_timecount =
i8254_simple_get_timecount;
i8254_timecounter.tc_counter_mask = 0xffff;
set_timer_freq(timer_freq, hz);
set_i8254_freq(i8254_freq, hz);
}
init_TSC_tc();
@ -730,10 +731,10 @@ sysctl_machdep_i8254_freq(SYSCTL_HANDLER_ARGS)
* Use `i8254' instead of `timer' in external names because `timer'
* is is too generic. Should use it everywhere.
*/
freq = timer_freq;
freq = i8254_freq;
error = sysctl_handle_int(oidp, &freq, 0, req);
if (error == 0 && req->newptr != NULL)
set_timer_freq(freq, hz);
set_i8254_freq(freq, hz);
return (error);
}
@ -744,7 +745,7 @@ static unsigned
i8254_simple_get_timecount(struct timecounter *tc)
{
return (timer0_max_count - getit());
return (i8254_max_count - getit());
}
static unsigned
@ -762,13 +763,13 @@ i8254_get_timecount(struct timecounter *tc)
low = inb(TIMER_CNTR0);
high = inb(TIMER_CNTR0);
count = timer0_max_count - ((high << 8) | low);
count = i8254_max_count - ((high << 8) | low);
if (count < i8254_lastcount ||
(!i8254_ticked && (clkintr_pending ||
((count < 20 || (!(eflags & PSL_I) && count < timer0_max_count / 2u)) &&
((count < 20 || (!(eflags & PSL_I) && count < i8254_max_count / 2u)) &&
i8254_pending != NULL && i8254_pending(i8254_intsrc))))) {
i8254_ticked = 1;
i8254_offset += timer0_max_count;
i8254_offset += i8254_max_count;
}
i8254_lastcount = count;
count += i8254_offset;

2
sys/pc98/cbus/syscons_cbus.c
View File

@ -233,7 +233,7 @@ sc_tone(int herz)
if (timer_spkr_acquire())
return EBUSY;
/* set pitch */
spkr_set_pitch(timer_freq / herz);
spkr_set_pitch(i8254_freq / herz);
} else {
/* disable counter 1 */
ppi_spkr_off();