80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2869 from Cacodemon345/acer_s20

Browse Source 
Fix AcerMagic S20 detection in a third-party driver
This commit is contained in:
Miran Grča
2022-11-16 07:08:08 +01:00
committed by GitHub
parent 53863231c7 984c558460
commit 659a4b5d88
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/sound/snd_azt2316a.c
View File

@@ -967,10 +967,8 @@ optimc_reg_write(uint16_t addr, uint8_t val, void *p)
optimc_reload_opl(azt2316a); optimc_reload_opl(azt2316a);
break; break;
case 2: /* MC3 */ case 2: /* MC3 */
if (val == 0xE3) { if (val == 0xE3)
reg_enable_phase = 1;
break; break;
}
azt2316a->opti_regs[2] = val; azt2316a->opti_regs[2] = val;
if (old != val) { if (old != val) {
optimc_remove_opl(azt2316a); optimc_remove_opl(azt2316a);
@@ -1050,7 +1048,12 @@ optimc_reg_write(uint16_t addr, uint8_t val, void *p)
break; break;
} }
} }
if (azt2316a->opti_reg_enabled)
azt2316a->opti_reg_enabled = 0;
if (addr == 0xF8F && (val == 0xE3 || val == 0x00)) { if (addr == 0xF8F && (val == 0xE3 || val == 0x00)) {
if (addr == 0xF8F && val == 0xE3 && !azt2316a->opti_reg_enabled) {
azt2316a->opti_reg_enabled = 1;
}
if (reg_enable_phase) { if (reg_enable_phase) {
switch (reg_enable_phase) { switch (reg_enable_phase) {
case 1: case 1:
@@ -1065,9 +1068,8 @@ optimc_reg_write(uint16_t addr, uint8_t val, void *p)
break; break;
case 3: case 3:
if (val == 0xE3) { if (val == 0xE3) {
azt2316a->opti_reg_enabled = 1; azt2316a->opti_regs[2] = 0x2;
azt2316a->opti_regs[2] = 0x2; reg_enable_phase = 1;
break;
} }
break; break;
} }
@@ -1081,6 +1083,7 @@ static uint8_t
optimc_reg_read(uint16_t addr, void *p) optimc_reg_read(uint16_t addr, void *p)
{ {
azt2316a_t *azt2316a = (azt2316a_t *) p; azt2316a_t *azt2316a = (azt2316a_t *) p;
uint8_t temp = 0xFF;
if (azt2316a->opti_reg_enabled) { if (azt2316a->opti_reg_enabled) {
switch (addr - 0xF8D) { switch (addr - 0xF8D) {
@@ -1088,14 +1091,16 @@ optimc_reg_read(uint16_t addr, void *p)
case 1: /* MC2 */ case 1: /* MC2 */
case 3: /* MC4 */ case 3: /* MC4 */
case 4: /* MC5 */ case 4: /* MC5 */
return azt2316a->opti_regs[addr - 0xF8D]; temp = azt2316a->opti_regs[addr - 0xF8D];
case 5: /* MC6 (not readable) */ case 5: /* MC6 (not readable) */
return 0xFF; break;
case 2: /* MC3 */ case 2: /* MC3 */
return (azt2316a->opti_regs[2] & ~0x3) | 0x2; temp = (azt2316a->opti_regs[2] & ~0x3) | 0x2;
break;
} }
azt2316a->opti_reg_enabled = 0;
} }
return 0xFF; return temp;
} }
static void * static void *
@@ -1635,7 +1640,7 @@ static const device_config_t azt1605_config[] = {
}; };
static const device_config_t azt2316a_config[] = { static const device_config_t azt2316a_config[] = {
// clang-format off // clang-format off
{ {
.name = "codec", .name = "codec",
.description = "CODEC", .description = "CODEC",
@@ -1752,7 +1757,7 @@ static const device_config_t azt2316a_config[] = {
.default_int = 0 .default_int = 0
}, },
{ .name = "", .description = "", .type = CONFIG_END } { .name = "", .description = "", .type = CONFIG_END }
// clang-format on // clang-format on
}; };
static const device_config_t acermagic_s20_config[] = { static const device_config_t acermagic_s20_config[] = {