Add a tc_ prefix to struct timecounter members.

Urged by:	bde

3 files changed, 14 insertions, 14 deletions

diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 0cc4bc2..4e14052 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.122 1998/06/07 08:40:23 phk Exp $
+ *	$Id: clock.c,v 1.123 1998/06/07 20:36:39 phk Exp $
  */
 
 /*
@@ -276,7 +276,7 @@ acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
 
 	if (rate <= 0 || rate > TIMER0_MAX_FREQ)
 		return (-1);
-	if (strcmp(timecounter->name, "i8254") == 0)
+	if (strcmp(timecounter->tc_name, "i8254") == 0)
 		return (-1);
 	switch (timer0_state) {
 
@@ -736,7 +736,7 @@ startrtclock()
 	}
 
 	set_timer_freq(timer_freq, hz);
-	i8254_timecounter[0].frequency = timer_freq;
+	i8254_timecounter[0].tc_frequency = timer_freq;
 	init_timecounter(i8254_timecounter);
 
 #ifndef CLK_USE_TSC_CALIBRATION
@@ -786,7 +786,7 @@ startrtclock()
 #endif /* NAPM > 0 */
 
 	if (tsc_present && tsc_freq != 0) {
-		tsc_timecounter[0].frequency = tsc_freq;
+		tsc_timecounter[0].tc_frequency = tsc_freq;
 		init_timecounter(tsc_timecounter);
 	}
 
@@ -1103,7 +1103,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].frequency = freq;
+		i8254_timecounter[0].tc_frequency = freq;
 	}
 	return (error);
 }
@@ -1123,7 +1123,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].frequency = tsc_freq;
+		tsc_timecounter[0].tc_frequency = tsc_freq;
 	}
 	return (error);
 }
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 0cc4bc2..4e14052 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.122 1998/06/07 08:40:23 phk Exp $
+ *	$Id: clock.c,v 1.123 1998/06/07 20:36:39 phk Exp $
  */
 
 /*
@@ -276,7 +276,7 @@ acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
 
 	if (rate <= 0 || rate > TIMER0_MAX_FREQ)
 		return (-1);
-	if (strcmp(timecounter->name, "i8254") == 0)
+	if (strcmp(timecounter->tc_name, "i8254") == 0)
 		return (-1);
 	switch (timer0_state) {
 
@@ -736,7 +736,7 @@ startrtclock()
 	}
 
 	set_timer_freq(timer_freq, hz);
-	i8254_timecounter[0].frequency = timer_freq;
+	i8254_timecounter[0].tc_frequency = timer_freq;
 	init_timecounter(i8254_timecounter);
 
 #ifndef CLK_USE_TSC_CALIBRATION
@@ -786,7 +786,7 @@ startrtclock()
 #endif /* NAPM > 0 */
 
 	if (tsc_present && tsc_freq != 0) {
-		tsc_timecounter[0].frequency = tsc_freq;
+		tsc_timecounter[0].tc_frequency = tsc_freq;
 		init_timecounter(tsc_timecounter);
 	}
 
@@ -1103,7 +1103,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].frequency = freq;
+		i8254_timecounter[0].tc_frequency = freq;
 	}
 	return (error);
 }
@@ -1123,7 +1123,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].frequency = tsc_freq;
+		tsc_timecounter[0].tc_frequency = tsc_freq;
 	}
 	return (error);
 }
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index be9f952..771e4cb 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.25 1998/04/15 17:45:44 bde Exp $
+ * $Id: random_machdep.c,v 1.26 1998/06/07 08:40:25 phk Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -184,7 +184,7 @@ add_timer_randomness(struct random_bucket *r, struct timer_rand_state *state,
 	u_int		nbits;
 	u_int32_t	time;
 
-	num ^= timecounter->get_timecount(timecounter) << 16;
+	num ^= timecounter->tc_get_timecount(timecounter) << 16;
 	r->entropy_count += 2;
 		
 	time = ticks;