Merge pull request #6774 from win2kgamer/cs423x-fix2

CS423x: Resolve issues with newer Windows drivers
This commit is contained in:
Miran Grča
2026-02-02 08:21:06 +01:00
committed by GitHub
2 changed files with 1 additions and 14 deletions

View File

@@ -411,19 +411,6 @@ ad1848_write(uint16_t addr, uint8_t val, void *priv)
goto readonly_i;
}
/* HACK: the Windows 9x driver's "Synth" control writes to this
register with no remapping, even if internal FM is enabled. */
if (ad1848->index == 18) {
if (val & 0x80)
ad1848->fm_vol_l = 0;
else
ad1848->fm_vol_l = (int) ad1848_vols_5bits_aux_gain[val & 0x1f];
} else {
if (val & 0x80)
ad1848->fm_vol_r = 0;
else
ad1848->fm_vol_r = (int) ad1848_vols_5bits_aux_gain[val & 0x1f];
}
}
if ((ad1848->type >= AD1848_TYPE_CS4232) && (ad1848->type <= AD1848_TYPE_CS4236)) {
if (ad1848->index == 18) {

View File

@@ -290,7 +290,7 @@ cs423x_write(uint16_t addr, uint8_t val, void *priv)
ad1848_init(&dev->ad1848, dev->ad1848_type);
ad1848_set_cd_audio_channel(&dev->ad1848, AD1848_AUX2);
}
val = 0x00;
val &= 0x07;
break;
case 1: /* Version / Chip ID */