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++;

16
src/scsi/scsi_buslogic.c
View File

@@ -1910,7 +1910,7 @@ static const device_config_t BT958D_Config[] = {
const device_t buslogic_542b_device = {
"BusLogic BT-542B ISA",
"buslogic_542b_1991",
"bt542b",
DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_542B_1991_12_14,
buslogic_init, x54x_close, NULL,
@@ -1920,7 +1920,7 @@ const device_t buslogic_542b_device = {
const device_t buslogic_545s_device = {
"BusLogic BT-545S ISA",
"buslogic_545s",
"bt545s",
DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_545S_1992_10_05,
buslogic_init, x54x_close, NULL,
@@ -1930,7 +1930,7 @@ const device_t buslogic_545s_device = {
const device_t buslogic_542bh_device = {
"BusLogic BT-542BH ISA",
"buslogic",
"bt542bh",
DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_542BH_1993_05_23,
buslogic_init, x54x_close, NULL,
@@ -1940,7 +1940,7 @@ const device_t buslogic_542bh_device = {
const device_t buslogic_545c_device = {
"BusLogic BT-545C ISA",
"buslogic_545c",
"bt545c",
DEVICE_ISA | DEVICE_AT,
CHIP_BUSLOGIC_ISA_545C_1994_12_01,
buslogic_init, x54x_close, NULL,
@@ -1950,7 +1950,7 @@ const device_t buslogic_545c_device = {
const device_t buslogic_640a_device = {
"BusLogic BT-640A MCA",
"buslogic_640a",
"bt640a",
DEVICE_MCA,
CHIP_BUSLOGIC_MCA_640A_1993_05_23,
buslogic_init, x54x_close, NULL,
@@ -1960,7 +1960,7 @@ const device_t buslogic_640a_device = {
const device_t buslogic_445s_device = {
"BusLogic BT-445S VLB",
"buslogic_445s",
"bt445s",
DEVICE_VLB,
CHIP_BUSLOGIC_VLB_445S_1993_11_16,
buslogic_init, x54x_close, NULL,
@@ -1970,7 +1970,7 @@ const device_t buslogic_445s_device = {
const device_t buslogic_445c_device = {
"BusLogic BT-445C VLB",
"buslogic_445c",
"bt445c",
DEVICE_VLB,
CHIP_BUSLOGIC_VLB_445C_1994_12_01,
buslogic_init, x54x_close, NULL,
@@ -1980,7 +1980,7 @@ const device_t buslogic_445c_device = {
const device_t buslogic_958d_pci_device = {
"BusLogic BT-958D PCI",
"buslogic_pci",
"bt958d",
DEVICE_PCI,
CHIP_BUSLOGIC_PCI_958D_1995_12_30,
buslogic_init, x54x_close, NULL,

8
src/scsi/scsi_ncr5380.c
View File

@@ -1786,7 +1786,7 @@ static const device_config_t t128_config[] = {
const device_t scsi_lcs6821n_device =
{
"Longshine LCS-6821N",
"scsi_lcs6821n",
"lcs6821n",
DEVICE_ISA,
0,
ncr_init, ncr_close, NULL,
@@ -1798,7 +1798,7 @@ const device_t scsi_lcs6821n_device =
const device_t scsi_rt1000b_device =
{
"Rancho RT1000B",
"scsi_rt1000b",
"rt1000b",
DEVICE_ISA,
1,
ncr_init, ncr_close, NULL,
@@ -1810,7 +1810,7 @@ const device_t scsi_rt1000b_device =
const device_t scsi_t130b_device =
{
"Trantor T130B",
"scsi_t130b",
"t130b",
DEVICE_ISA,
2,
ncr_init, ncr_close, NULL,
@@ -1822,7 +1822,7 @@ const device_t scsi_t130b_device =
const device_t scsi_t128_device =
{
"Trantor T128",
"scsi_t128",
"t128",
DEVICE_ISA,
3,
ncr_init, ncr_close, NULL,

14
src/scsi/scsi_ncr53c8xx.c
View File

@@ -2660,7 +2660,7 @@ static const device_config_t ncr53c8xx_pci_config[] = {
const device_t ncr53c810_pci_device =
{
"NCR 53c810",
"ncr53c810_pci",
"ncr53c810",
DEVICE_PCI,
CHIP_810,
ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2671,7 +2671,7 @@ const device_t ncr53c810_pci_device =
const device_t ncr53c810_onboard_pci_device =
{
"NCR 53c810 On-Board",
"ncr53c810_onboard_pci",
"ncr53c810_onboard",
DEVICE_PCI,
0x8001,
ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2682,7 +2682,7 @@ const device_t ncr53c810_onboard_pci_device =
const device_t ncr53c815_pci_device =
{
"NCR 53c815",
"ncr53c815_pci",
"ncr53c815",
DEVICE_PCI,
CHIP_815,
ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2693,7 +2693,7 @@ const device_t ncr53c815_pci_device =
const device_t ncr53c820_pci_device =
{
"NCR 53c820",
"ncr53c820_pci",
"ncr53c820",
DEVICE_PCI,
CHIP_820,
ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2704,7 +2704,7 @@ const device_t ncr53c820_pci_device =
const device_t ncr53c825a_pci_device =
{
"NCR 53c825A",
"ncr53c825a_pci",
"ncr53c825a",
DEVICE_PCI,
CHIP_825,
ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2715,7 +2715,7 @@ const device_t ncr53c825a_pci_device =
const device_t ncr53c860_pci_device =
{
"NCR 53c860",
"ncr53c860_pci",
"ncr53c860",
DEVICE_PCI,
CHIP_860,
ncr53c8xx_init, ncr53c8xx_close, NULL,
@@ -2726,7 +2726,7 @@ const device_t ncr53c860_pci_device =
const device_t ncr53c875_pci_device =
{
"NCR 53c875",
"ncr53c875_pci",
"ncr53c875",
DEVICE_PCI,
CHIP_875,
ncr53c8xx_init, ncr53c8xx_close, NULL,

4
src/scsi/scsi_pcscsi.c
View File

@@ -2012,7 +2012,7 @@ static const device_config_t bios_enable_config[] = {
const device_t dc390_pci_device =
{
"Tekram DC-390 PCI",
"dc390_pci",
"dc390",
DEVICE_PCI,
0,
dc390_init, esp_close, NULL,
@@ -2023,7 +2023,7 @@ const device_t dc390_pci_device =
const device_t ncr53c90_mca_device =
{
"NCR 53c90 MCA",
"ncr53c90_mca",
"ncr53c90",
DEVICE_MCA,
0,
ncr53c90_mca_init, esp_close, NULL,

2
src/scsi/scsi_spock.c
View File

@@ -1179,7 +1179,7 @@ static const device_config_t spock_rom_config[] = {
const device_t spock_device =
{
"IBM PS/2 SCSI Adapter (Spock)",
"spock",
"spock",
DEVICE_MCA,
0,
spock_init, spock_close, NULL,