claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sound Blaster PnP: Ignore IDE PnP changes if IDE is not present, fixes #5077.

Browse Source
This commit is contained in:
OBattler
2024-12-30 18:55:10 +01:00
parent 9a5bfcfd25
commit b449f6f310
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/snd_sb.h
View File

@@ -182,6 +182,7 @@ typedef struct sb_t {
void *gameport;
int pnp;
int has_ide;
uint8_t pos_regs[8];
uint8_t pnp_rom[512];

11
src/sound/snd_sb.c
View File

@@ -2181,7 +2181,8 @@ sb_16_pnp_config_changed(const uint8_t ld, isapnp_device_config_t *config, void
break;
case 1: /* IDE */
ide_pnp_config_changed(0, config, (void *) 3);
if (sb->has_ide)
ide_pnp_config_changed(0, config, (void *) 3);
break;
case 2: /* Reserved (16) / WaveTable (32+) */
@@ -3338,6 +3339,8 @@ sb_16_pnp_init(UNUSED(const device_t *info))
if (info->local != SB_16_PNP_NOIDE) {
device_add(&ide_qua_pnp_device);
other_ide_present++;
sb->has_ide = 1;
}
const char *pnp_rom_file = NULL;
@@ -3671,6 +3674,8 @@ sb_awe32_pnp_init(const device_t *info)
if ((info->local != SB_AWE64_VALUE) && (info->local != SB_AWE64_NOIDE) && (info->local != SB_AWE64_GOLD)) {
device_add(&ide_qua_pnp_device);
other_ide_present++;
sb->has_ide = 1;
}
const char *pnp_rom_file = NULL;
@@ -3849,6 +3854,8 @@ ess_x688_init(UNUSED(const device_t *info))
ide_set_side(4, ide_side);
ide_set_irq(4, ide_irq);
other_ide_present++;
ess->has_ide = 1;
}
return ess;
@@ -3907,6 +3914,8 @@ ess_x688_pnp_init(UNUSED(const device_t *info))
device_add(&ide_qua_pnp_device);
other_ide_present++;
ess->has_ide = 1;
const char *pnp_rom_file = NULL;
uint16_t pnp_rom_len = 512;
switch (info->local) {