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

All devices now have the bus marked in their name;

Browse Source 
The Settings dialog now correctly filters devices by bus;
Split the dual VLB/PCI graphics cards into VLB and PCI versions;
Device filtering is now done using the new device_is_valid() call that compares device flags to machine flags;
Moved the NCR-based SCSI controllers to the main branch;
Moved the NE1000 to the dev branch until it's finished.
This commit is contained in:
OBattler
2017-10-10 00:14:15 +02:00
parent efc129eb22
commit 253ad40376
55 changed files with 852 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/scsi/scsi.c
View File

@@ -8,7 +8,7 @@
*
* Handling of the SCSI controllers.
*
* Version: @(#)scsi.c 1.0.8 2017/10/07
* Version: @(#)scsi.c 1.0.9 2017/10/10
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -30,11 +30,7 @@
#include "scsi.h"
#include "scsi_aha154x.h"
#include "scsi_buslogic.h"
#ifdef DEV_BRANCH
#ifdef USE_NCR
#include "scsi_ncr5380.h"
#endif
#endif
scsi_device_t SCSIDevices[SCSI_ID_MAX][SCSI_LUN_MAX];
@@ -60,19 +56,15 @@ typedef struct {
static SCSI_CARD scsi_cards[] = {
{ "None", "none", NULL, NULL },
{ "Adaptec AHA-1540B", "aha1540b", &aha1540b_device, aha_device_reset },
{ "Adaptec AHA-1542C", "aha1542c", &aha1542c_device, aha_device_reset },
{ "Adaptec AHA-1542CF", "aha1542cf", &aha1542cf_device, aha_device_reset },
{ "Adaptec AHA-1640", "aha1640", &aha1640_device, aha_device_reset },
{ "BusLogic BT-545C", "bt545c", &buslogic_device, BuslogicDeviceReset },
{ "BusLogic BT-958D PCI", "bt958d", &buslogic_pci_device, BuslogicDeviceReset },
#ifdef DEV_BRANCH
#ifdef USE_NCR
{ "Longshine LCS-6821N", "lcs6821n", &scsi_lcs6821n_device,NULL },
{ "Ranco RT1000B", "rt1000b", &scsi_rt1000b_device, NULL },
{ "Trantor T130B", "t130b", &scsi_t130b_device, NULL },
#endif
#endif
{ "[ISA] Adaptec AHA-1540B","aha1540b", &aha1540b_device, aha_device_reset },
{ "[ISA] Adaptec AHA-1542C","aha1542c", &aha1542c_device, aha_device_reset },
{ "[ISA] Adaptec AHA-1542CF","aha1542cf", &aha1542cf_device, aha_device_reset },
{ "[ISA] Longshine LCS-6821N","lcs6821n", &scsi_lcs6821n_device,NULL },
{ "[ISA] Ranco RT1000B", "rt1000b", &scsi_rt1000b_device, NULL },
{ "[ISA] Trantor T130B", "t130b", &scsi_t130b_device, NULL },
{ "[MCA] Adaptec AHA-1640", "aha1640", &aha1640_device, aha_device_reset },
{ "[PCI] BusLogic BT-545C", "bt545c", &buslogic_device, BuslogicDeviceReset },
{ "[PCI] BusLogic BT-958D", "bt958d", &buslogic_pci_device, BuslogicDeviceReset },
{ "", "", NULL, NULL },
};

6
src/scsi/scsi_aha154x.c
View File

@@ -2294,7 +2294,7 @@ static device_config_t aha_154x_config[] = {
device_t aha1540b_device = {
"Adaptec AHA-1540B",
0,
DEVICE_ISA | DEVICE_AT,
AHA_154xB,
aha_init,
aha_close,
@@ -2308,7 +2308,7 @@ device_t aha1540b_device = {
device_t aha1542c_device = {
"Adaptec AHA-1542C",
0,
DEVICE_ISA | DEVICE_AT,
AHA_154xC,
aha_init,
aha_close,
@@ -2322,7 +2322,7 @@ device_t aha1542c_device = {
device_t aha1542cf_device = {
"Adaptec AHA-1542CF",
0,
DEVICE_ISA | DEVICE_AT,
AHA_154xCF,
aha_init,
aha_close,

2
src/scsi/scsi_buslogic.c
View File

@@ -3157,7 +3157,7 @@ static device_config_t BT958D_Config[] = {
device_t buslogic_device = {
"Buslogic BT-545C ISA",
0,
DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA,
Buslogic_Init,
BuslogicClose,

6
src/scsi/scsi_ncr5380.c
View File

@@ -837,7 +837,7 @@ t130b_available(void)
device_t scsi_lcs6821n_device =
{
"Longshine LCS-6821N (SCSI)",
0,
DEVICE_ISA,
0,
ncr_init, ncr_close, NULL,
lcs6821n_available,
@@ -848,7 +848,7 @@ device_t scsi_lcs6821n_device =
device_t scsi_rt1000b_device =
{
"Ranco RT1000B (SCSI)",
0,
DEVICE_ISA,
1,
ncr_init, ncr_close, NULL,
rt1000b_available,
@@ -859,7 +859,7 @@ device_t scsi_rt1000b_device =
device_t scsi_t130b_device =
{
"Trantor T130B (SCSI)",
0,
DEVICE_ISA,
2,
ncr_init, ncr_close, NULL,
t130b_available,