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

Merge pull request #1373 from lemondrops/master

Browse Source 
Improvements to onboard SCSI controller handling
This commit is contained in:
Miran Grča
2021-04-13 22:25:15 +02:00
committed by GitHub
parent a384949108 451922980f
commit 915b0eac80
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/win/win_media_menu.c
View File

@@ -23,6 +23,7 @@
#include <86box/win.h> #include <86box/win.h>
#define MACHINE_HAS_IDE (machines[machine].flags & MACHINE_IDE_QUAD) #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 FDD_FIRST 0
#define CDROM_FIRST FDD_FIRST + FDD_NUM #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) if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !MACHINE_HAS_IDE)
return 0; 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 0;
return cdrom[i].bus_type != 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) if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !MACHINE_HAS_IDE)
return 0; 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 0;
return zip_drives[i].bus_type != 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) if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !MACHINE_HAS_IDE)
return 0; 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 0;
return mo_drives[i].bus_type != 0; return mo_drives[i].bus_type != 0;
} }

2
src/win/win_stbar.c
View File

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