choose one AC97 name and stick with it a bit more often

5 files changed, 24 insertions, 24 deletions

diff --git a/share/man/man4/ac97.4 b/share/man/man4/ac97.4
index 20fea216944..8caa1220f12 100644
--- a/share/man/man4/ac97.4
+++ b/share/man/man4/ac97.4
@@ -1,15 +1,15 @@
-.\"	$OpenBSD: ac97.4,v 1.9 2001/09/06 15:04:34 mpech Exp $
+.\"	$OpenBSD: ac97.4,v 1.10 2001/12/05 10:00:18 deraadt Exp $
 .\"
 .Dd October 7, 1999
 .Dt AC97 4
 .Os
 .Sh NAME
 .Nm ac97
-.Nd generic AC-97 codec driver
+.Nd generic AC97 codec driver
 .Sh DESCRIPTION
-AC-97 codecs contain the analog-to-digital (A/D), digital-to-analog
+AC97 codecs contain the analog-to-digital (A/D), digital-to-analog
 (D/A), and mixing circuitry of many modern sound cards.
-AC-97 codecs, for the most part, do not talk to host busses like the PCI bus
+AC97 codecs, for the most part, do not talk to host busses like the PCI bus
 directly.
 Instead, they communicate through an interface chip, called
 the host controller.
diff --git a/share/man/man4/autri.4 b/share/man/man4/autri.4
index d1ee51e507b..d90d15b200f 100644
--- a/share/man/man4/autri.4
+++ b/share/man/man4/autri.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: autri.4,v 1.1 2001/11/26 16:51:48 mickey Exp $
+.\"	$OpenBSD: autri.4,v 1.2 2001/12/05 10:00:18 deraadt Exp $
 .\"	$NetBSD: autri.4,v 1.1 2001/11/18 16:46:49 augustss Exp $
 .\"
 .\" Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -37,7 +37,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-device driver supports the AC'97 audio controller found in
+device driver supports the AC97 audio controller found in
 Trident 4DWAVE-DX/NX, SiS 7018 and ALi M5451.
 .Sh SEE ALSO
 .Xr audio 4 ,
diff --git a/share/man/man4/auvia.4 b/share/man/man4/auvia.4
index 900e69feef3..3397b6ea2e4 100644
--- a/share/man/man4/auvia.4
+++ b/share/man/man4/auvia.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: auvia.4,v 1.2 2000/07/22 12:22:19 aaron Exp $
+.\" $OpenBSD: auvia.4,v 1.3 2001/12/05 10:00:18 deraadt Exp $
 .\" $NetBSD: auvia.4,v 1.1 2000/03/31 05:49:59 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -40,14 +40,14 @@
 .Os
 .Sh NAME
 .Nm auvia
-.Nd VIA VT82C686A integrated AC'97 audio device driver
+.Nd VIA VT82C686A integrated AC97 audio device driver
 .Sh SYNOPSIS
 .Cd "auvia* at pci? dev ? function ?"
 .Cd "audio* at auvia?"
 .Sh DESCRIPTION
 The
 .Nm
-device driver supports the integrated AC'97 audio controller
+device driver supports the integrated AC97 audio controller
 of the VIA Technologies VT82C686A Southbridge chip found on some
 motherboards.
 .Sh SEE ALSO
diff --git a/share/man/man4/maestro.4 b/share/man/man4/maestro.4
index 90ada1c9aae..e2e4e82739c 100644
--- a/share/man/man4/maestro.4
+++ b/share/man/man4/maestro.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: maestro.4,v 1.7 2001/10/29 04:31:13 deraadt Exp $
+.\"   $OpenBSD: maestro.4,v 1.8 2001/12/05 10:00:18 deraadt Exp $
 .\"
 .\" Copyright (c) 2001 Marc Espie.
 .\" All rights reserved.
@@ -37,7 +37,7 @@ The
 .Nm
 driver supports ESS maestro 1, 2 and 2E, including OEM products that
 identify as NEC Versa, or NEC VersaProNX VA26D, as long as they use
-an AC'97 compliant codec, which is always the case, except for very
+an AC97 compliant codec, which is always the case, except for very
 early models. 
 It does not support maestro 3 cards, which are entirely different.
 .Pp
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 4d8020808cd..f13b29641da 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autri.c,v 1.3 2001/12/01 16:43:32 mickey Exp $	*/
+/*	$OpenBSD: autri.c,v 1.4 2001/12/05 10:00:18 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -242,7 +242,7 @@ autri_reg_clear_4(sc, no, mask)
 }
 
 /*
- * AC'97 codec
+ * AC97 codec
  */
 int
 autri_attach_codec(sc_, codec_if)
@@ -307,12 +307,12 @@ autri_read_codec(sc_, index, data)
 	}
 
 	if (count == 0xffff) {
-		printf("%s: Codec timeout. Busy reading AC'97 codec.\n",
+		printf("%s: Codec timeout. Busy reading AC97 codec.\n",
 		    sc->sc_dev.dv_xname);
 		return -1;
 	}
 
-	/* send Read Command to AC'97 */
+	/* send Read Command to AC97 */
 	TWRITE4(sc, addr, (index & 0x7f) | cmd);
 
 	/* wait for 'Returned data is avalable' */
@@ -323,7 +323,7 @@ autri_read_codec(sc_, index, data)
 	}
 
 	if (count == 0xffff) {
-		printf("%s: Codec timeout. Busy reading AC'97 codec.\n",
+		printf("%s: Codec timeout. Busy reading AC97 codec.\n",
 		    sc->sc_dev.dv_xname);
 		return -1;
 	}
@@ -382,12 +382,12 @@ autri_write_codec(sc_, index, data)
 	}
 
 	if (count == 0xffff) {
-		printf("%s: Codec timeout. Busy writing AC'97 codec\n",
+		printf("%s: Codec timeout. Busy writing AC97 codec\n",
 		    sc->sc_dev.dv_xname);
 		return -1;
 	}
 
-	/* send Write Command to AC'97 */
+	/* send Write Command to AC97 */
 	TWRITE4(sc, addr, (data << 16) | (index & 0x7f) | cmd);
 
 	return 0;
@@ -407,7 +407,7 @@ autri_reset_codec(sc_)
 
 	switch (sc->sc_devid) {
 	case AUTRI_DEVICE_ID_4DWAVE_DX:
-		/* warm reset AC'97 codec */
+		/* warm reset AC97 codec */
 		autri_reg_set_4(sc, AUTRI_DX_ACR2, 1);
 		delay(100);
 		/* release reset */
@@ -418,7 +418,7 @@ autri_reset_codec(sc_)
 		ready = AUTRI_DX_ACR2_CODEC_READY;
 		break;
 	case AUTRI_DEVICE_ID_4DWAVE_NX:
-		/* warm reset AC'97 codec */
+		/* warm reset AC97 codec */
 		autri_reg_set_4(sc, AUTRI_NX_ACR0, 1);
 		delay(100);
 		/* release reset */
@@ -429,7 +429,7 @@ autri_reset_codec(sc_)
 		ready = AUTRI_NX_ACR0_CODEC_READY;
 		break;
 	case AUTRI_DEVICE_ID_SIS_7018:
-		/* warm reset AC'97 codec */
+		/* warm reset AC97 codec */
 		autri_reg_set_4(sc, AUTRI_SIS_SCTRL, 1);
 		delay(100);
 		/* release reset (warm & cold) */
@@ -440,7 +440,7 @@ autri_reset_codec(sc_)
 		ready = AUTRI_SIS_SCTRL_CODEC_READY;
 		break;
 	case AUTRI_DEVICE_ID_ALI_M5451:
-		/* warm reset AC'97 codec */
+		/* warm reset AC97 codec */
 		autri_reg_set_4(sc, AUTRI_ALI_SCTRL, 1);
 		delay(100);
 		/* release reset (warm & cold) */
@@ -461,7 +461,7 @@ autri_reset_codec(sc_)
 	}
 
 	if (count == 0)
-		printf("%s: Codec timeout. AC'97 is not ready for operation.\n",
+		printf("%s: Codec timeout. AC97 is not ready for operation.\n",
 		    sc->sc_dev.dv_xname);
 }
 
@@ -562,7 +562,7 @@ autri_attach(parent, self, aux)
 	/* initialize the device */
 	autri_init(sc);
 
-	/* attach AC'97 codec */
+	/* attach AC97 codec */
 	codec = &sc->sc_codec;
 	memcpy(&codec->sc_dev, &sc->sc_dev, sizeof(codec->sc_dev));
 	codec->sc = sc;