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

Reworked the menus so they're more logically grouped;

Browse Source 
Removed the lone Misc menu and mvoed Status to Settings;
Added a SCSI CD-ROM option to the menu;
Removed the atapi_cdrom_enabled option and replaced any usage of it with !scsi_cdrom_enabled;
Disabling/enabling the CD-ROM drive is now separate from the drive's contents;
The tertiary IDE controller now never gets enabled is the CD-ROM drive is either disabled or SCSI.
This commit is contained in:
OBattler
2016-11-13 05:39:21 +01:00
parent 36f19628a1
commit e46631e47b
7 changed files with 95 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ide.c
View File

@@ -629,10 +629,9 @@ void resetide(void)
{
ide_drives[d].packetstatus = 0xFF;
if ((atapi_cdrom_channel == d) && atapi_cdrom_enabled)
if ((atapi_cdrom_channel == d) && cdrom_enabled && !scsi_cdrom_enabled)
{
if (cdrom_enabled)
ide_drives[d].type = IDE_CDROM;
ide_drives[d].type = IDE_CDROM;
}
else
{
@@ -654,10 +653,9 @@ void resetide(void)
{
ide_drives[d].packetstatus = 0xFF;
if ((atapi_cdrom_channel == d) && atapi_cdrom_enabled)
if ((atapi_cdrom_channel == d) && cdrom_enabled && !scsi_cdrom_enabled)
{
if (cdrom_enabled)
ide_drives[d].type = IDE_CDROM;
ide_drives[d].type = IDE_CDROM;
}
else
{