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

Sync with sys/i386/isa/clock.c revision 1.128.

Browse Source
This commit is contained in:
kato 1998-10-23 13:13:43 +00:00
parent ad78851424
commit e5f2c0e337
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
* $Id: clock.c,v 1.62 1998/10/13 02:33:21 kato Exp $
* $Id: clock.c,v 1.63 1998/10/13 03:24:01 kato Exp $
*/
/*
@ -198,7 +198,7 @@ static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));
static void set_timer_freq(u_int freq, int intr_freq);
static struct timecounter tsc_timecounter[3] = {
static struct timecounter tsc_timecounter = {
tsc_get_timecount, /* get_timecount */
0, /* no poll_pps */
~0u, /* counter_mask */
@ -207,9 +207,9 @@ static struct timecounter tsc_timecounter[3] = {
};
SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD,
tsc_timecounter, sizeof(tsc_timecounter), "S,timecounter", "");
&tsc_timecounter, sizeof(tsc_timecounter), "S,timecounter", "");
static struct timecounter i8254_timecounter[3] = {
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
0, /* no poll_pps */
~0u, /* counter_mask */
@ -218,7 +218,7 @@ static struct timecounter i8254_timecounter[3] = {
};
SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD,
i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", "");
&i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", "");
static void
clkintr(struct clockframe frame)
@ -952,8 +952,8 @@ startrtclock()
}
set_timer_freq(timer_freq, hz);
i8254_timecounter[0].tc_frequency = timer_freq;
init_timecounter(i8254_timecounter);
i8254_timecounter.tc_frequency = timer_freq;
init_timecounter(&i8254_timecounter);
#ifndef CLK_USE_TSC_CALIBRATION
if (tsc_freq != 0) {
@ -1002,8 +1002,8 @@ startrtclock()
#endif /* NAPM > 0 */
if (tsc_present && tsc_freq != 0) {
tsc_timecounter[0].tc_frequency = tsc_freq;
init_timecounter(tsc_timecounter);
tsc_timecounter.tc_frequency = tsc_freq;
init_timecounter(&tsc_timecounter);
}
#endif /* !defined(SMP) */
@ -1467,7 +1467,7 @@ sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS
if (timer0_state != RELEASED)
return (EBUSY); /* too much trouble to handle */
set_timer_freq(freq, hz);
i8254_timecounter[0].tc_frequency = freq;
i8254_timecounter.tc_frequency = freq;
}
return (error);
}
@ -1487,7 +1487,7 @@ sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS
error = sysctl_handle_opaque(oidp, &freq, sizeof freq, req);
if (error == 0 && req->newptr != NULL) {
tsc_freq = freq;
tsc_timecounter[0].tc_frequency = tsc_freq;
tsc_timecounter.tc_frequency = tsc_freq;
}
return (error);
}

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

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
* $Id: clock.c,v 1.62 1998/10/13 02:33:21 kato Exp $
* $Id: clock.c,v 1.63 1998/10/13 03:24:01 kato Exp $
*/
/*
@ -198,7 +198,7 @@ static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));
static void set_timer_freq(u_int freq, int intr_freq);
static struct timecounter tsc_timecounter[3] = {
static struct timecounter tsc_timecounter = {
tsc_get_timecount, /* get_timecount */
0, /* no poll_pps */
~0u, /* counter_mask */
@ -207,9 +207,9 @@ static struct timecounter tsc_timecounter[3] = {
};
SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD,
tsc_timecounter, sizeof(tsc_timecounter), "S,timecounter", "");
&tsc_timecounter, sizeof(tsc_timecounter), "S,timecounter", "");
static struct timecounter i8254_timecounter[3] = {
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
0, /* no poll_pps */
~0u, /* counter_mask */
@ -218,7 +218,7 @@ static struct timecounter i8254_timecounter[3] = {
};
SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD,
i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", "");
&i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", "");
static void
clkintr(struct clockframe frame)
@ -952,8 +952,8 @@ startrtclock()
}
set_timer_freq(timer_freq, hz);
i8254_timecounter[0].tc_frequency = timer_freq;
init_timecounter(i8254_timecounter);
i8254_timecounter.tc_frequency = timer_freq;
init_timecounter(&i8254_timecounter);
#ifndef CLK_USE_TSC_CALIBRATION
if (tsc_freq != 0) {
@ -1002,8 +1002,8 @@ startrtclock()
#endif /* NAPM > 0 */
if (tsc_present && tsc_freq != 0) {
tsc_timecounter[0].tc_frequency = tsc_freq;
init_timecounter(tsc_timecounter);
tsc_timecounter.tc_frequency = tsc_freq;
init_timecounter(&tsc_timecounter);
}
#endif /* !defined(SMP) */
@ -1467,7 +1467,7 @@ sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS
if (timer0_state != RELEASED)
return (EBUSY); /* too much trouble to handle */
set_timer_freq(freq, hz);
i8254_timecounter[0].tc_frequency = freq;
i8254_timecounter.tc_frequency = freq;
}
return (error);
}
@ -1487,7 +1487,7 @@ sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS
error = sysctl_handle_opaque(oidp, &freq, sizeof freq, req);
if (error == 0 && req->newptr != NULL) {
tsc_freq = freq;
tsc_timecounter[0].tc_frequency = tsc_freq;
tsc_timecounter.tc_frequency = tsc_freq;
}
return (error);
}

22
sys/pc98/pc98/clock.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
* $Id: clock.c,v 1.62 1998/10/13 02:33:21 kato Exp $
* $Id: clock.c,v 1.63 1998/10/13 03:24:01 kato Exp $
*/
/*
@ -198,7 +198,7 @@ static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));
static void set_timer_freq(u_int freq, int intr_freq);
static struct timecounter tsc_timecounter[3] = {
static struct timecounter tsc_timecounter = {
tsc_get_timecount, /* get_timecount */
0, /* no poll_pps */
~0u, /* counter_mask */
@ -207,9 +207,9 @@ static struct timecounter tsc_timecounter[3] = {
};
SYSCTL_OPAQUE(_debug, OID_AUTO, tsc_timecounter, CTLFLAG_RD,
tsc_timecounter, sizeof(tsc_timecounter), "S,timecounter", "");
&tsc_timecounter, sizeof(tsc_timecounter), "S,timecounter", "");
static struct timecounter i8254_timecounter[3] = {
static struct timecounter i8254_timecounter = {
i8254_get_timecount, /* get_timecount */
0, /* no poll_pps */
~0u, /* counter_mask */
@ -218,7 +218,7 @@ static struct timecounter i8254_timecounter[3] = {
};
SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD,
i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", "");
&i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", "");
static void
clkintr(struct clockframe frame)
@ -952,8 +952,8 @@ startrtclock()
}
set_timer_freq(timer_freq, hz);
i8254_timecounter[0].tc_frequency = timer_freq;
init_timecounter(i8254_timecounter);
i8254_timecounter.tc_frequency = timer_freq;
init_timecounter(&i8254_timecounter);
#ifndef CLK_USE_TSC_CALIBRATION
if (tsc_freq != 0) {
@ -1002,8 +1002,8 @@ startrtclock()
#endif /* NAPM > 0 */
if (tsc_present && tsc_freq != 0) {
tsc_timecounter[0].tc_frequency = tsc_freq;
init_timecounter(tsc_timecounter);
tsc_timecounter.tc_frequency = tsc_freq;
init_timecounter(&tsc_timecounter);
}
#endif /* !defined(SMP) */
@ -1467,7 +1467,7 @@ sysctl_machdep_i8254_freq SYSCTL_HANDLER_ARGS
if (timer0_state != RELEASED)
return (EBUSY); /* too much trouble to handle */
set_timer_freq(freq, hz);
i8254_timecounter[0].tc_frequency = freq;
i8254_timecounter.tc_frequency = freq;
}
return (error);
}
@ -1487,7 +1487,7 @@ sysctl_machdep_tsc_freq SYSCTL_HANDLER_ARGS
error = sysctl_handle_opaque(oidp, &freq, sizeof freq, req);
if (error == 0 && req->newptr != NULL) {
tsc_freq = freq;
tsc_timecounter[0].tc_frequency = tsc_freq;
tsc_timecounter.tc_frequency = tsc_freq;
}
return (error);
}