d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compensate for broken codecs that return 0xffff on unimplemented registers

Browse Source 
instead of 0.
This commit is contained in:
cg 2000-12-24 03:33:21 +00:00
parent d756562577
commit 97cafaa0df
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/sound/pcm/ac97.c
View File

@ -320,15 +320,16 @@ ac97_initmixer(struct ac97_info *codec)
}
}
if (codec->noext) {
codec->extcaps = 0;
codec->extid = 0;
codec->extstat = 0;
} else {
codec->extcaps = 0;
codec->extid = 0;
codec->extstat = 0;
if (!codec->noext) {
i = rdcd(codec, AC97_REGEXT_ID);
codec->extcaps = i & 0x3fff;
codec->extid = (i & 0xc000) >> 14;
codec->extstat = rdcd(codec, AC97_REGEXT_STAT) & AC97_EXTCAPS;
if (i != 0xffff) {
codec->extcaps = i & 0x3fff;
codec->extid = (i & 0xc000) >> 14;
codec->extstat = rdcd(codec, AC97_REGEXT_STAT) & AC97_EXTCAPS;
}
}
for (i = 0; i < 32; i++) {
@ -338,7 +339,7 @@ ac97_initmixer(struct ac97_info *codec)
wrcd(codec, codec->mix[i].reg, 0x3f);
j = rdcd(codec, codec->mix[i].reg);
wrcd(codec, codec->mix[i].reg, old);
codec->mix[i].enable = j? 1 : 0;
codec->mix[i].enable = (j != 0 && j != old)? 1 : 0;
for (k = 1; j & (1 << k); k++);
codec->mix[i].bits = j? k - codec->mix[i].ofs : 0;
}