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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2021-04-14 16:14:07 -03:00
parent fc50bd9bad 915b0eac80
commit 57c4bc485e
5 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/win/Makefile.mingw
View File

@@ -51,6 +51,9 @@ ifeq ($(DEV_BUILD), y)
ifndef I450KX
I450KX := y
endif
ifndef M154X
M145X := y
endif
ifndef LASERXT
LASERXT := y
endif
@@ -130,6 +133,9 @@ else
ifndef LASERXT
LASERXT := n
endif
ifndef M154X
M145X := n
endif
ifndef MGA
MGA := n
endif

7
src/win/win_media_menu.c
View File

@@ -23,6 +23,7 @@
#include <86box/win.h>
#define MACHINE_HAS_IDE (machines[machine].flags & MACHINE_IDE_QUAD)
#define MACHINE_HAS_SCSI (machines[machine].flags & MACHINE_SCSI_DUAL)
#define FDD_FIRST 0
#define CDROM_FIRST FDD_FIRST + FDD_NUM
@@ -294,7 +295,7 @@ is_valid_cdrom(int i)
{
if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !MACHINE_HAS_IDE)
return 0;
if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && (scsi_card_current == 0))
if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0))
return 0;
return cdrom[i].bus_type != 0;
}
@@ -304,7 +305,7 @@ is_valid_zip(int i)
{
if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !MACHINE_HAS_IDE)
return 0;
if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && (scsi_card_current == 0))
if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0))
return 0;
return zip_drives[i].bus_type != 0;
}
@@ -314,7 +315,7 @@ is_valid_mo(int i)
{
if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !MACHINE_HAS_IDE)
return 0;
if ((mo_drives[i].bus_type == MO_BUS_SCSI) && (scsi_card_current == 0))
if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0))
return 0;
return mo_drives[i].bus_type != 0;
}

2
src/win/win_stbar.c
View File

@@ -641,7 +641,7 @@ ui_sb_update_panes(void)
sb_map[SB_HDD | HDD_BUS_IDE] = sb_parts;
sb_parts++;
}
if (c_scsi && (scsi_card_current != 0)) {
if (c_scsi && (scsi_int || (scsi_card_current != 0))) {
edge += icon_width;
iStatusWidths[sb_parts] = edge;
sb_part_meanings[sb_parts] = SB_HDD | HDD_BUS_SCSI;