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

Changes to handling of seconary IDE controller when it is optional.

Browse Source
This commit is contained in:
OBattler
2018-11-09 09:50:35 +01:00
parent cc32193dbf
commit e73ccc2e4a
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/disk/hdc_ide.c
View File

@@ -9,7 +9,7 @@
* Implementation of the IDE emulation for hard disks and ATAPI * Implementation of the IDE emulation for hard disks and ATAPI
* CD-ROM devices. * CD-ROM devices.
* *
* Version: @(#)hdc_ide.c 1.0.58 2018/10/31 * Version: @(#)hdc_ide.c 1.0.59 2018/11/09
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -126,6 +126,7 @@ int (*ide_bus_master_dma)(int channel, uint8_t *data, int transfer_length, int o
void (*ide_bus_master_set_irq)(int channel, void *priv); void (*ide_bus_master_set_irq)(int channel, void *priv);
void *ide_bus_master_priv[2]; void *ide_bus_master_priv[2];
int ide_inited = 0; int ide_inited = 0;
int ide_sec_optional = 0;
int ide_ter_enabled = 0, ide_qua_enabled = 0; int ide_ter_enabled = 0, ide_qua_enabled = 0;
static uint16_t ide_base_main[4] = { 0x1f0, 0x170, 0x168, 0x1e8 }; static uint16_t ide_base_main[4] = { 0x1f0, 0x170, 0x168, 0x1e8 };
@@ -2623,21 +2624,9 @@ ide_set_bus_master(int (*dma)(int channel, uint8_t *data, int transfer_length, i
void void
secondary_ide_check(void) secondary_ide_check(void)
{ {
int i = 0; /* If secondary IDE is optional and the secondary master is not present or not ATAPI,
int secondary_cdroms = 0; disable secondary IDE. */
int secondary_zips = 0; if (ide_sec_optional && (!ide_drives[4] || (ide_drives[4]->type != IDE_ATAPI)))
for (i=0; i<ZIP_NUM; i++) {
if ((zip_drives[i].ide_channel >= 2) && (zip_drives[i].ide_channel <= 3) &&
(zip_drives[i].bus_type == ZIP_BUS_ATAPI))
secondary_zips++;
}
for (i=0; i<CDROM_NUM; i++) {
if ((cdrom[i].ide_channel >= 2) && (cdrom[i].ide_channel <= 3) &&
(cdrom[i].bus_type == CDROM_BUS_ATAPI))
secondary_cdroms++;
}
if (!secondary_zips && !secondary_cdroms)
ide_remove_handlers(1); ide_remove_handlers(1);
} }
@@ -2697,8 +2686,7 @@ ide_init(const device_t *info)
ide_board_init(1); ide_board_init(1);
if (info->local & 1) ide_sec_optional = (info->local & 1);
secondary_ide_check();
ide_inited |= 2; ide_inited |= 2;
} }

3
src/sound/sound.c
View File

@@ -27,6 +27,7 @@
#include "../device.h" #include "../device.h"
#include "../timer.h" #include "../timer.h"
#include "../cdrom/cdrom.h" #include "../cdrom/cdrom.h"
#include "../disk/hdc_ide.h"
#include "../plat.h" #include "../plat.h"
#include "sound.h" #include "sound.h"
#include "midi.h" #include "midi.h"
@@ -498,4 +499,6 @@ sound_cd_thread_reset(void)
sound_cd_thread_end(); sound_cd_thread_end();
cd_thread_enable = available_cdrom_drives ? 1 : 0; cd_thread_enable = available_cdrom_drives ? 1 : 0;
secondary_ide_check();
} }