From 2e36499ddf774a6f3844861b378a8f0d188543a2 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Fri, 23 Oct 1998 10:46:20 +0000
Subject: [PATCH] Update timecounters to new interface.

---
 sys/amd64/amd64/tsc.c | 22 +++++++++++-----------
 sys/amd64/isa/clock.c | 22 +++++++++++-----------
 sys/i386/i386/tsc.c   | 22 +++++++++++-----------
 sys/i386/isa/clock.c  | 22 +++++++++++-----------
 sys/i386/isa/loran.c  |  6 +++---
 sys/isa/atrtc.c       | 22 +++++++++++-----------
 6 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 7515141cb1f6..0ef3ad609e97 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
+ *	$Id: clock.c,v 1.127 1998/09/20 19:56:28 bde Exp $
  */
 
 /*
@@ -173,7 +173,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 */
@@ -182,9 +182,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 */
@@ -193,7 +193,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)
@@ -751,8 +751,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) {
@@ -801,8 +801,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) */
@@ -1118,7 +1118,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);
 }
@@ -1138,7 +1138,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);
 }
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 7515141cb1f6..0ef3ad609e97 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
+ *	$Id: clock.c,v 1.127 1998/09/20 19:56:28 bde Exp $
  */
 
 /*
@@ -173,7 +173,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 */
@@ -182,9 +182,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 */
@@ -193,7 +193,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)
@@ -751,8 +751,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) {
@@ -801,8 +801,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) */
@@ -1118,7 +1118,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);
 }
@@ -1138,7 +1138,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);
 }
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 7515141cb1f6..0ef3ad609e97 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.126 1998/09/20 03:47:54 bde Exp $
+ *	$Id: clock.c,v 1.127 1998/09/20 19:56:28 bde Exp $
  */
 
 /*
@@ -173,7 +173,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 */
@@ -182,9 +182,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 */
@@ -193,7 +193,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)
@@ -751,8 +751,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) {
@@ -801,8 +801,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) */
@@ -1118,7 +1118,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);
 }
@@ -1138,7 +1138,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);
 }
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 7515141cb1f6..0ef3ad609e97 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.126 1998/09/20 03:47:54 bde Exp $
+ *	$Id: clock.c,v 1.127 1998/09/20 19:56:28 bde Exp $
  */
 
 /*
@@ -173,7 +173,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 */
@@ -182,9 +182,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 */
@@ -193,7 +193,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)
@@ -751,8 +751,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) {
@@ -801,8 +801,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) */
@@ -1118,7 +1118,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);
 }
@@ -1138,7 +1138,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);
 }
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index ee34511c636e..07aff88d7c5b 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: loran.c,v 1.8 1998/08/17 19:09:36 bde Exp $
+ * $Id: loran.c,v 1.9 1998/10/22 05:58:39 bde Exp $
  *
  * This device-driver helps the userland controlprogram for a LORAN-C
  * receiver avoid monopolizing the CPU.
@@ -270,7 +270,7 @@ loranattach(struct isa_device *isdp)
 	 
 	init_tgc();
 
-	init_timecounter(loran_timecounter);
+	init_timecounter(&loran_timecounter);
 
 	TAILQ_INIT(&qdone);
 	TAILQ_INIT(&qready);
@@ -560,7 +560,7 @@ loran_get_timecount(struct timecounter *tc)
 	return (count);
 }
 
-static struct timecounter loran_timecounter[3] = {
+static struct timecounter loran_timecounter = {
 	loran_get_timecount,	/* get_timecount */
 	0,			/* no pps_poll */
 	0xffff,			/* counter_mask */
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 7515141cb1f6..0ef3ad609e97 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $
+ *	$Id: clock.c,v 1.127 1998/09/20 19:56:28 bde Exp $
  */
 
 /*
@@ -173,7 +173,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 */
@@ -182,9 +182,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 */
@@ -193,7 +193,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)
@@ -751,8 +751,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) {
@@ -801,8 +801,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) */
@@ -1118,7 +1118,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);
 }
@@ -1138,7 +1138,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);
 }