From cf642210d356ceea9ed607d6d086f496853ce617 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Tue, 19 Apr 2005 18:05:02 +0000
Subject: [PATCH] Change herz to hertz.

---
 sys/bus/isa/syscons_isa.c      |  8 ++++----
 sys/dev/misc/labpc/labpc.c     | 12 ++++++------
 sys/dev/misc/syscons/syscons.h |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/bus/isa/syscons_isa.c b/sys/bus/isa/syscons_isa.c
index aed02ecf6d..c0a47e7bae 100644
--- a/sys/bus/isa/syscons_isa.c
+++ b/sys/bus/isa/syscons_isa.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/isa/syscons_isa.c,v 1.11.2.2 2001/08/01 10:42:28 yokota Exp $
- * $DragonFly: src/sys/bus/isa/syscons_isa.c,v 1.5 2004/08/02 23:20:28 dillon Exp $
+ * $DragonFly: src/sys/bus/isa/syscons_isa.c,v 1.6 2005/04/19 18:05:02 swildner Exp $
  */
 
 #include "opt_syscons.h"
@@ -210,7 +210,7 @@ sc_get_bios_values(bios_values_t *values)
 }
 
 int
-sc_tone(int herz)
+sc_tone(int hertz)
 {
 	return EBUSY;
 #if 0
@@ -218,12 +218,12 @@ sc_tone(int herz)
 #ifdef __i386__
 	int pitch;
 
-	if (herz) {
+	if (hertz) {
 		/* set command for counter 2, 2 byte write */
 		if (acquire_timer2(TIMER_16BIT | TIMER_SQWAVE))
 			return EBUSY;
 		/* set pitch */
-		pitch = cputimer_freq/herz;
+		pitch = cputimer_freq/hertz;
 		outb(TIMER_CNTR2, pitch);
 		outb(TIMER_CNTR2, pitch >> 8);
 		/* enable counter 2 output to speaker */
diff --git a/sys/dev/misc/labpc/labpc.c b/sys/dev/misc/labpc/labpc.c
index 06fc985ee6..193ada406c 100644
--- a/sys/dev/misc/labpc/labpc.c
+++ b/sys/dev/misc/labpc/labpc.c
@@ -39,7 +39,7 @@
  * dufault@hda.com
  *
  * $FreeBSD: src/sys/i386/isa/labpc.c,v 1.35 1999/09/25 18:24:08 phk Exp $
- * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.9 2004/09/18 19:08:06 dillon Exp $
+ * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.10 2005/04/19 18:05:02 swildner Exp $
  *
  */
 
@@ -70,8 +70,8 @@
 #define LABPC_MIN_TMO (hz)
 #endif
 
-#ifndef LABPC_DEFAULT_HERZ
-#define LABPC_DEFAULT_HERZ 500
+#ifndef LABPC_DEFAULT_HERTZ
+#define LABPC_DEFAULT_HERTZ 500
 #endif
 
 /* Minor number:
@@ -127,8 +127,8 @@ struct ctlr
 	struct buf *last;	/* End of start queue */
 	u_char *data;
 	u_char *data_end;
-	long tmo;			/* Timeout in Herz */
-	long min_tmo;		/* Timeout in Herz */
+	long tmo;			/* Timeout in Hertz */
+	long min_tmo;		/* Timeout in Hertz */
 	int cleared_intr;
 
 	int gains[8];
@@ -481,7 +481,7 @@ labpcattach(struct isa_device *dev)
 
 	dev->id_ointr = labpcintr;
 	callout_init(&ctlr->ch);
-	ctlr->sample_us = (1000000.0 / (double)LABPC_DEFAULT_HERZ) + .50;
+	ctlr->sample_us = (1000000.0 / (double)LABPC_DEFAULT_HERTZ) + .50;
 	reset(ctlr);
 
 	ctlr->min_tmo = LABPC_MIN_TMO;
diff --git a/sys/dev/misc/syscons/syscons.h b/sys/dev/misc/syscons/syscons.h
index 76da6197dc..be495083f2 100644
--- a/sys/dev/misc/syscons/syscons.h
+++ b/sys/dev/misc/syscons/syscons.h
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.60.2.6 2002/09/15 22:30:45 dd Exp $
- * $DragonFly: src/sys/dev/misc/syscons/syscons.h,v 1.12 2005/03/28 21:30:23 swildner Exp $
+ * $DragonFly: src/sys/dev/misc/syscons/syscons.h,v 1.13 2005/04/19 18:05:02 swildner Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
@@ -642,6 +642,6 @@ sc_softc_t	*sc_get_softc(int unit, int flags);
 sc_softc_t	*sc_find_softc(struct video_adapter *adp, struct keyboard *kbd);
 int		sc_get_cons_priority(int *unit, int *flags);
 void		sc_get_bios_values(bios_values_t *values);
-int		sc_tone(int herz);
+int		sc_tone(int hertz);
 
 #endif /* !_DEV_SYSCONS_SYSCONS_H_ */
-- 
2.41.0