mirror of
https://github.com/86Box/86Box.git
synced 2025-01-23 17:52:01 -05:00
Merge branch 'master' into version/4.1
This commit is contained in:
commit
e88c6b4a94
1 changed files with 3 additions and 2 deletions
|
@ -2230,7 +2230,7 @@ sb_16_pnp_init(UNUSED(const device_t *info))
|
|||
sb_dsp_setdma16(&sb->dsp, ISAPNP_DMA_DISABLED);
|
||||
|
||||
mpu401_change_addr(sb->mpu, 0);
|
||||
ide_remove_handlers(2);
|
||||
ide_remove_handlers(3);
|
||||
|
||||
sb->gameport_addr = 0;
|
||||
gameport_remap(sb->gameport, 0);
|
||||
|
@ -2559,7 +2559,8 @@ sb_awe32_pnp_init(const device_t *info)
|
|||
sb_dsp_setdma16(&sb->dsp, ISAPNP_DMA_DISABLED);
|
||||
|
||||
mpu401_change_addr(sb->mpu, 0);
|
||||
ide_remove_handlers(2);
|
||||
if ((info->local != 2) && (info->local != 3) && (info->local != 4))
|
||||
ide_remove_handlers(3);
|
||||
|
||||
emu8k_change_addr(&sb->emu8k, 0);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue