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

src/scsi

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-03-13 09:54:10 -04:00
parent e188137b96
commit 98be04c955
7 changed files with 377 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/scsi/scsi.c
View File

@@ -52,12 +52,17 @@ static uint8_t next_scsi_bus = 0;
static const device_t scsi_none_device = { static const device_t scsi_none_device = {
"None", .name = "None",
"none", .internal_name = "none",
0, 0, .flags = 0,
NULL, NULL, NULL, .local = 0,
{ NULL }, NULL, NULL, .init = NULL,
NULL .close = NULL,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };
@@ -67,39 +72,41 @@ typedef const struct {
static SCSI_CARD scsi_cards[] = { static SCSI_CARD scsi_cards[] = {
{ &scsi_none_device, }, // clang-format off
{ &aha154xa_device, }, { &scsi_none_device, },
{ &aha154xb_device, }, { &aha154xa_device, },
{ &aha154xc_device, }, { &aha154xb_device, },
{ &aha154xcf_device, }, { &aha154xc_device, },
{ &aha154xcp_device, }, { &aha154xcf_device, },
{ &buslogic_542b_device, }, { &aha154xcp_device, },
{ &buslogic_542bh_device, }, { &buslogic_542b_device, },
{ &buslogic_545s_device, }, { &buslogic_542bh_device, },
{ &buslogic_545c_device, }, { &buslogic_545s_device, },
{ &scsi_ls2000_device, }, { &buslogic_545c_device, },
{ &scsi_lcs6821n_device, }, { &scsi_ls2000_device, },
{ &scsi_rt1000b_device, }, { &scsi_lcs6821n_device, },
{ &scsi_t128_device, }, { &scsi_rt1000b_device, },
{ &scsi_t130b_device, }, { &scsi_t128_device, },
{ &scsi_t130b_device, },
#ifdef WALTJE #ifdef WALTJE
{ &scsi_wd33c93_device, }, { &scsi_wd33c93_device, },
#endif #endif
{ &aha1640_device, }, { &aha1640_device, },
{ &buslogic_640a_device, }, { &buslogic_640a_device, },
{ &ncr53c90_mca_device, }, { &ncr53c90_mca_device, },
{ &spock_device, }, { &spock_device, },
{ &buslogic_958d_pci_device, }, { &buslogic_958d_pci_device, },
{ &ncr53c810_pci_device, }, { &ncr53c810_pci_device, },
{ &ncr53c815_pci_device, }, { &ncr53c815_pci_device, },
{ &ncr53c820_pci_device, }, { &ncr53c820_pci_device, },
{ &ncr53c825a_pci_device, }, { &ncr53c825a_pci_device, },
{ &ncr53c860_pci_device, }, { &ncr53c860_pci_device, },
{ &ncr53c875_pci_device, }, { &ncr53c875_pci_device, },
{ &dc390_pci_device, }, { &dc390_pci_device, },
{ &buslogic_445s_device, }, { &buslogic_445s_device, },
{ &buslogic_445c_device, }, { &buslogic_445c_device, },
{ NULL, }, { NULL, },
// clang-format on
}; };

108
src/scsi/scsi_aha154x.c
View File

@@ -1320,61 +1320,85 @@ static const device_config_t aha_154xcf_config[] = {
// clang-format on // clang-format on
const device_t aha154xa_device = { const device_t aha154xa_device = {
"Adaptec AHA-154xA", .name = "Adaptec AHA-154xA",
"aha154xa", .internal_name = "aha154xa",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
AHA_154xA, .local = AHA_154xA,
aha_init, x54x_close, NULL, .init = aha_init,
{ NULL }, NULL, NULL, .close = x54x_close,
aha_154xb_config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = aha_154xb_config
}; };
const device_t aha154xb_device = { const device_t aha154xb_device = {
"Adaptec AHA-154xB", .name = "Adaptec AHA-154xB",
"aha154xb", .internal_name = "aha154xb",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
AHA_154xB, .local = AHA_154xB,
aha_init, x54x_close, NULL, .init = aha_init,
{ NULL }, NULL, NULL, .close = x54x_close,
aha_154xb_config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = aha_154xb_config
}; };
const device_t aha154xc_device = { const device_t aha154xc_device = {
"Adaptec AHA-154xC", .name = "Adaptec AHA-154xC",
"aha154xc", .internal_name = "aha154xc",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
AHA_154xC, .local = AHA_154xC,
aha_init, x54x_close, NULL, .init = aha_init,
{ NULL }, NULL, NULL, .close = x54x_close,
aha_154x_config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = aha_154x_config
}; };
const device_t aha154xcf_device = { const device_t aha154xcf_device = {
"Adaptec AHA-154xCF", .name = "Adaptec AHA-154xCF",
"aha154xcf", .internal_name = "aha154xcf",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
AHA_154xCF, .local = AHA_154xCF,
aha_init, x54x_close, NULL, .init = aha_init,
{ NULL }, NULL, NULL, .close = x54x_close,
aha_154xcf_config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = aha_154xcf_config
}; };
const device_t aha154xcp_device = { const device_t aha154xcp_device = {
"Adaptec AHA-154xCP", .name = "Adaptec AHA-154xCP",
"aha154xcp", .internal_name = "aha154xcp",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
AHA_154xCP, .local = AHA_154xCP,
aha_init, aha1542cp_close, NULL, .init = aha_init,
{ NULL }, NULL, NULL, .close = aha1542cp_close,
NULL .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };
const device_t aha1640_device = { const device_t aha1640_device = {
"Adaptec AHA-1640", .name = "Adaptec AHA-1640",
"aha1640", .internal_name = "aha1640",
DEVICE_MCA, .flags = DEVICE_MCA,
AHA_1640, .local = AHA_1640,
aha_init, x54x_close, NULL, .init = aha_init,
{ NULL }, NULL, NULL, .close = x54x_close,
NULL .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };

144
src/scsi/scsi_buslogic.c
View File

@@ -1857,81 +1857,113 @@ static const device_config_t BT958D_Config[] = {
// clang-format on // clang-format on
const device_t buslogic_542b_device = { const device_t buslogic_542b_device = {
"BusLogic BT-542B ISA", .name = "BusLogic BT-542B ISA",
"bt542b", .internal_name = "bt542b",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_542B_1991_12_14, .local = CHIP_BUSLOGIC_ISA_542B_1991_12_14,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
BT_ISA_Config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = BT_ISA_Config
}; };
const device_t buslogic_545s_device = { const device_t buslogic_545s_device = {
"BusLogic BT-545S ISA", .name = "BusLogic BT-545S ISA",
"bt545s", .internal_name = "bt545s",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_545S_1992_10_05, .local = CHIP_BUSLOGIC_ISA_545S_1992_10_05,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
BT_ISA_Config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = BT_ISA_Config
}; };
const device_t buslogic_542bh_device = { const device_t buslogic_542bh_device = {
"BusLogic BT-542BH ISA", .name = "BusLogic BT-542BH ISA",
"bt542bh", .internal_name = "bt542bh",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_542BH_1993_05_23, .local = CHIP_BUSLOGIC_ISA_542BH_1993_05_23,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
BT_ISA_Config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = BT_ISA_Config
}; };
const device_t buslogic_545c_device = { const device_t buslogic_545c_device = {
"BusLogic BT-545C ISA", .name = "BusLogic BT-545C ISA",
"bt545c", .internal_name = "bt545c",
DEVICE_ISA | DEVICE_AT, .flags = DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_545C_1994_12_01, .local = CHIP_BUSLOGIC_ISA_545C_1994_12_01,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
BT_ISA_Config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = BT_ISA_Config
}; };
const device_t buslogic_640a_device = { const device_t buslogic_640a_device = {
"BusLogic BT-640A MCA", .name = "BusLogic BT-640A MCA",
"bt640a", .internal_name = "bt640a",
DEVICE_MCA, .flags = DEVICE_MCA,
CHIP_BUSLOGIC_MCA_640A_1993_05_23, .local = CHIP_BUSLOGIC_MCA_640A_1993_05_23,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
NULL .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };
const device_t buslogic_445s_device = { const device_t buslogic_445s_device = {
"BusLogic BT-445S VLB", .name = "BusLogic BT-445S VLB",
"bt445s", .internal_name = "bt445s",
DEVICE_VLB, .flags = DEVICE_VLB,
CHIP_BUSLOGIC_VLB_445S_1993_11_16, .local = CHIP_BUSLOGIC_VLB_445S_1993_11_16,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
BT_ISA_Config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = BT_ISA_Config
}; };
const device_t buslogic_445c_device = { const device_t buslogic_445c_device = {
"BusLogic BT-445C VLB", .name = "BusLogic BT-445C VLB",
"bt445c", .internal_name = "bt445c",
DEVICE_VLB, .flags = DEVICE_VLB,
CHIP_BUSLOGIC_VLB_445C_1994_12_01, .local = CHIP_BUSLOGIC_VLB_445C_1994_12_01,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
BT_ISA_Config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = BT_ISA_Config
}; };
const device_t buslogic_958d_pci_device = { const device_t buslogic_958d_pci_device = {
"BusLogic BT-958D PCI", .name = "BusLogic BT-958D PCI",
"bt958d", .internal_name = "bt958d",
DEVICE_PCI, .flags = DEVICE_PCI,
CHIP_BUSLOGIC_PCI_958D_1995_12_30, .local = CHIP_BUSLOGIC_PCI_958D_1995_12_30,
buslogic_init, x54x_close, NULL, .init = buslogic_init,
{ NULL }, NULL, NULL, .close = x54x_close,
BT958D_Config .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = BT958D_Config
}; };

110
src/scsi/scsi_ncr5380.c
View File

@@ -1707,62 +1707,72 @@ static const device_config_t t128_config[] = {
}; };
// clang-format on // clang-format on
const device_t scsi_lcs6821n_device = const device_t scsi_lcs6821n_device = {
{ .name = "Longshine LCS-6821N",
"Longshine LCS-6821N", .internal_name = "lcs6821n",
"lcs6821n", .flags = DEVICE_ISA,
DEVICE_ISA, .local = 0,
0, .init = ncr_init,
ncr_init, ncr_close, NULL, .close = ncr_close,
{ lcs6821n_available }, .reset = NULL,
NULL, NULL, { .available = lcs6821n_available },
ncr5380_mmio_config .speed_changed = NULL,
.force_redraw = NULL,
.config = ncr5380_mmio_config
}; };
const device_t scsi_rt1000b_device = const device_t scsi_rt1000b_device = {
{ .name = "Rancho RT1000B",
"Rancho RT1000B", .internal_name = "rt1000b",
"rt1000b", .flags = DEVICE_ISA,
DEVICE_ISA, .local = 1,
1, .init = ncr_init,
ncr_init, ncr_close, NULL, .close = ncr_close,
{ rt1000b_available }, .reset = NULL,
NULL, NULL, { .available = rt1000b_available },
rancho_config .speed_changed = NULL,
.force_redraw = NULL,
.config = rancho_config
}; };
const device_t scsi_t130b_device = const device_t scsi_t130b_device = {
{ .name = "Trantor T130B",
"Trantor T130B", .internal_name = "t130b",
"t130b", .flags = DEVICE_ISA,
DEVICE_ISA, .local = 2,
2, .init = ncr_init,
ncr_init, ncr_close, NULL, .close = ncr_close,
{ t130b_available }, .reset = NULL,
NULL, NULL, { .available = t130b_available },
t130b_config .speed_changed = NULL,
.force_redraw = NULL,
.config = t130b_config
}; };
const device_t scsi_t128_device = const device_t scsi_t128_device = {
{ .name = "Trantor T128",
"Trantor T128", .internal_name = "t128",
"t128", .flags = DEVICE_ISA,
DEVICE_ISA, .local = 3,
3, .init = ncr_init,
ncr_init, ncr_close, NULL, .close = ncr_close,
{ t128_available }, .reset = NULL,
NULL, NULL, { .available = t128_available },
t128_config .speed_changed = NULL,
.force_redraw = NULL,
.config = t128_config
}; };
const device_t scsi_ls2000_device = const device_t scsi_ls2000_device = {
{ .name = "Corel LS2000",
"Corel LS2000", .internal_name = "ls2000",
"ls2000", .flags = DEVICE_ISA,
DEVICE_ISA, .local = 4,
4, .init = ncr_init,
ncr_init, ncr_close, NULL, .close = ncr_close,
{ corel_ls2000_available }, .reset = NULL,
NULL, NULL, { .available = corel_ls2000_available },
ncr5380_mmio_config .speed_changed = NULL,
.force_redraw = NULL,
.config = ncr5380_mmio_config
}; };

146
src/scsi/scsi_ncr53c8xx.c
View File

@@ -2648,80 +2648,100 @@ static const device_config_t ncr53c8xx_pci_config[] = {
// clang-format on // clang-format on
}; };
const device_t ncr53c810_pci_device = {
const device_t ncr53c810_pci_device = .name = "NCR 53c810",
{ .internal_name = "ncr53c810",
"NCR 53c810", .flags = DEVICE_PCI,
"ncr53c810", .local = CHIP_810,
DEVICE_PCI, .init = ncr53c8xx_init,
CHIP_810, .close = ncr53c8xx_close,
ncr53c8xx_init, ncr53c8xx_close, NULL, .reset = NULL,
{ NULL }, NULL, NULL, { .available = NULL },
NULL .speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };
const device_t ncr53c810_onboard_pci_device = const device_t ncr53c810_onboard_pci_device = {
{ .name = "NCR 53c810 On-Board",
"NCR 53c810 On-Board", .internal_name = "ncr53c810_onboard",
"ncr53c810_onboard", .flags = DEVICE_PCI,
DEVICE_PCI, .local = 0x8001,
0x8001, .init = ncr53c8xx_init,
ncr53c8xx_init, ncr53c8xx_close, NULL, .close = ncr53c8xx_close,
{ NULL }, NULL, NULL, .reset = NULL,
NULL { .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };
const device_t ncr53c815_pci_device = const device_t ncr53c815_pci_device = {
{ .name = "NCR 53c815",
"NCR 53c815", .internal_name = "ncr53c815",
"ncr53c815", .flags = DEVICE_PCI,
DEVICE_PCI, .local = CHIP_815,
CHIP_815, .init = ncr53c8xx_init,
ncr53c8xx_init, ncr53c8xx_close, NULL, .close = ncr53c8xx_close,
{ NULL }, NULL, NULL, .reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
ncr53c8xx_pci_config ncr53c8xx_pci_config
}; };
const device_t ncr53c820_pci_device = const device_t ncr53c820_pci_device = {
{ .name = "NCR 53c820",
"NCR 53c820", .internal_name = "ncr53c820",
"ncr53c820", .flags = DEVICE_PCI,
DEVICE_PCI, .local = CHIP_820,
CHIP_820, .init = ncr53c8xx_init,
ncr53c8xx_init, ncr53c8xx_close, NULL, .close = ncr53c8xx_close,
{ NULL }, NULL, NULL, .reset = NULL,
NULL { .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };
const device_t ncr53c825a_pci_device = const device_t ncr53c825a_pci_device = {
{ .name = "NCR 53c825A",
"NCR 53c825A", .internal_name = "ncr53c825a",
"ncr53c825a", .flags = DEVICE_PCI,
DEVICE_PCI, .local = CHIP_825,
CHIP_825, .init = ncr53c8xx_init,
ncr53c8xx_init, ncr53c8xx_close, NULL, .close = ncr53c8xx_close,
{ NULL }, NULL, NULL, .reset = NULL,
ncr53c8xx_pci_config { .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ncr53c8xx_pci_config
}; };
const device_t ncr53c860_pci_device = const device_t ncr53c860_pci_device = {
{ .name = "NCR 53c860",
"NCR 53c860", .internal_name = "ncr53c860",
"ncr53c860", .flags = DEVICE_PCI,
DEVICE_PCI, .local = CHIP_860,
CHIP_860, .init = ncr53c8xx_init,
ncr53c8xx_init, ncr53c8xx_close, NULL, .close = ncr53c8xx_close,
{ NULL }, NULL, NULL, .reset = NULL,
ncr53c8xx_pci_config { .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ncr53c8xx_pci_config
}; };
const device_t ncr53c875_pci_device = const device_t ncr53c875_pci_device = {
{ .name = "NCR 53c875",
"NCR 53c875", .internal_name = "ncr53c875",
"ncr53c875", .flags = DEVICE_PCI,
DEVICE_PCI, .local = CHIP_875,
CHIP_875, .init = ncr53c8xx_init,
ncr53c8xx_init, ncr53c8xx_close, NULL, .close = ncr53c8xx_close,
{ NULL }, NULL, NULL, .reset = NULL,
ncr53c8xx_pci_config { .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ncr53c8xx_pci_config
}; };

42
src/scsi/scsi_pcscsi.c
View File

@@ -2010,24 +2010,30 @@ static const device_config_t bios_enable_config[] = {
// clang-format on // clang-format on
}; };
const device_t dc390_pci_device = const device_t dc390_pci_device = {
{ .name = "Tekram DC-390 PCI",
"Tekram DC-390 PCI", .internal_name = "dc390",
"dc390", .flags = DEVICE_PCI,
DEVICE_PCI, .local = 0,
0, .init = dc390_init,
dc390_init, esp_close, NULL, .close = esp_close,
{ NULL }, NULL, NULL, .reset = NULL,
bios_enable_config { .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = bios_enable_config
}; };
const device_t ncr53c90_mca_device = const device_t ncr53c90_mca_device = {
{ .name = "NCR 53c90 MCA",
"NCR 53c90 MCA", .internal_name = "ncr53c90",
"ncr53c90", .flags = DEVICE_MCA,
DEVICE_MCA, .local = 0,
0, .init = ncr53c90_mca_init,
ncr53c90_mca_init, esp_close, NULL, .close = esp_close,
{ NULL }, NULL, NULL, .reset = NULL,
NULL { .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
}; };

22
src/scsi/scsi_spock.c
View File

@@ -1170,14 +1170,16 @@ static const device_config_t spock_rom_config[] = {
// clang-format on // clang-format on
}; };
const device_t spock_device = const device_t spock_device = {
{ .name = "IBM PS/2 SCSI Adapter (Spock)",
"IBM PS/2 SCSI Adapter (Spock)", .internal_name = "spock",
"spock", .flags = DEVICE_MCA,
DEVICE_MCA, .local = 0,
0, .init = spock_init,
spock_init, spock_close, NULL, .close = spock_close,
{ spock_available }, .reset = NULL,
NULL, NULL, { .available = spock_available },
spock_rom_config .speed_changed = NULL,
.force_redraw = NULL,
.config = spock_rom_config
}; };