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

A lot of fixes - everything now seems to work properly.

Browse Source
This commit is contained in:
OBattler
2022-02-03 03:10:06 +01:00
parent 296e25c685
commit 6f2b93923c
59 changed files with 551 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/scsi/scsi.c
View File

@@ -53,7 +53,7 @@ static uint8_t next_scsi_bus = 0;
static const device_t scsi_none_device = {
"None",
"scsi_none",
"none",
0, 0,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
@@ -67,38 +67,38 @@ typedef const struct {
static SCSI_CARD scsi_cards[] = {
{ &scsi_none_device, },
{ &aha154xa_device, },
{ &aha154xb_device, },
{ &aha154xc_device, },
{ &aha154xcf_device, },
{ &aha154xcp_device, },
{ &buslogic_542b_device, },
{ &buslogic_542bh_device, },
{ &buslogic_545s_device, },
{ &buslogic_545c_device, },
{ &scsi_lcs6821n_device, },
{ &scsi_rt1000b_device, },
{ &scsi_t128_device, },
{ &scsi_t130b_device, },
{ &scsi_none_device, },
{ &aha154xa_device, },
{ &aha154xb_device, },
{ &aha154xc_device, },
{ &aha154xcf_device, },
{ &aha154xcp_device, },
{ &buslogic_542b_device, },
{ &buslogic_542bh_device, },
{ &buslogic_545s_device, },
{ &buslogic_545c_device, },
{ &scsi_lcs6821n_device, },
{ &scsi_rt1000b_device, },
{ &scsi_t128_device, },
{ &scsi_t130b_device, },
#ifdef WALTJE
{ &scsi_wd33c93_device, },
{ &scsi_wd33c93_device, },
#endif
{ &aha1640_device, },
{ &buslogic_640a_device, },
{ &ncr53c90_mca_device, },
{ &spock_device, },
{ &aha1640_device, },
{ &buslogic_640a_device, },
{ &ncr53c90_mca_device, },
{ &spock_device, },
{ &buslogic_958d_pci_device, },
{ &ncr53c810_pci_device, },
{ &ncr53c815_pci_device, },
{ &ncr53c820_pci_device, },
{ &ncr53c825a_pci_device, },
{ &ncr53c860_pci_device, },
{ &ncr53c875_pci_device, },
{ &dc390_pci_device, },
{ &buslogic_445s_device, },
{ &buslogic_445c_device, },
{ NULL, },
{ &ncr53c810_pci_device, },
{ &ncr53c815_pci_device, },
{ &ncr53c820_pci_device, },
{ &ncr53c825a_pci_device, },
{ &ncr53c860_pci_device, },
{ &ncr53c875_pci_device, },
{ &dc390_pci_device, },
{ &buslogic_445s_device, },
{ &buslogic_445c_device, },
{ NULL, },
};
@@ -152,7 +152,7 @@ scsi_card_has_config(int card)
char *
scsi_card_get_internal_name(int card)
{
return((char *) scsi_cards[card].device->internal_name);
return device_get_internal_name(scsi_cards[card].device);
}
@@ -161,7 +161,7 @@ scsi_card_get_from_internal_name(char *s)
{
int c = 0;
while (strlen((char *) scsi_cards[c].device->internal_name)) {
while (scsi_cards[c].device != NULL) {
if (!strcmp((char *) scsi_cards[c].device->internal_name, s))
return(c);
c++;