summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authororion <orion@FreeBSD.org>2003-02-03 01:38:43 +0000
committerorion <orion@FreeBSD.org>2003-02-03 01:38:43 +0000
commitbfb168afa99b3aff61a6b54d92f0d695d90be956 (patch)
treeb165bf28282fca243ec98181a3fc22a67623c578
parentf0ebe6996abb15724b4e71be083c7de047fbac85 (diff)
downloadFreeBSD-src-bfb168afa99b3aff61a6b54d92f0d695d90be956.zip
FreeBSD-src-bfb168afa99b3aff61a6b54d92f0d695d90be956.tar.gz
Print ac97 name/id on normal boot.
Fix typo reported in pr misc/47794.
-rw-r--r--sys/dev/sound/pcm/ac97.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index a246f68..a4b49a3 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -92,7 +92,7 @@ static struct ac97_codecid ac97codecid[] = {
{ 0x414b4d01, 1, "Asahi Kasei AK4542", 0 },
{ 0x414b4d02, 1, "Asahi Kasei AK4543", 0 },
{ 0x414c4710, 0, "Avance Logic ALC200/200P", 0 },
- { 0x414c4720, 0, "Realtek Semiconductor ALC650", 0 },
+ { 0x414c4720, 0, "Realtek ALC650", 0 },
{ 0x43525900, 0, "Cirrus Logic CS4297", 0 },
{ 0x43525903, 0, "Cirrus Logic CS4297", 0 },
{ 0x43525913, 0, "Cirrus Logic CS4297A", 0 },
@@ -216,7 +216,7 @@ ac97_reset(struct ac97_info *codec)
return;
DELAY(1000);
}
- device_printf(codec->dev, "AC97 reset timed out.");
+ device_printf(codec->dev, "AC97 reset timed out.\n");
}
int
@@ -477,11 +477,14 @@ ac97_initmixer(struct ac97_info *codec)
/* printf("mixch %d, en=%d, b=%d\n", i, codec->mix[i].enable, codec->mix[i].bits); */
}
+ if (codec->id) {
+ device_printf(codec->dev, "<%s ac97 codec>\n", codec->id);
+ } else {
+ device_printf(codec->dev,
+ "<unknown ac97 codec> (id=0x%08x)\n", id);
+ }
+
if (bootverbose) {
- device_printf(codec->dev, "ac97 codec id 0x%08x", id);
- if (codec->id)
- printf(" (%s)", codec->id);
- printf("\n");
device_printf(codec->dev, "ac97 codec features ");
for (i = j = 0; i < 10; i++)
if (codec->caps & (1 << i))
OpenPOWER on IntegriCloud