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

src/disk

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-04-02 17:08:04 -04:00
parent 50ef360282
commit c01ab374a4
11 changed files with 220 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/disk/hdc_esdi_at.c
View File

@@ -843,7 +843,6 @@ wd1007vse1_available(void)
return(rom_present(BIOS_FILE)); return(rom_present(BIOS_FILE));
} }
const device_t esdi_at_wd1007vse1_device = { const device_t esdi_at_wd1007vse1_device = {
.name = "Western Digital WD1007V-SE1 (ESDI)", .name = "Western Digital WD1007V-SE1 (ESDI)",
.internal_name = "esdi_at", .internal_name = "esdi_at",

1
src/disk/hdc_esdi_mca.c
View File

@@ -1178,7 +1178,6 @@ esdi_available(void)
return(rom_present(BIOS_FILE_L) && rom_present(BIOS_FILE_H)); return(rom_present(BIOS_FILE_L) && rom_present(BIOS_FILE_H));
} }
const device_t esdi_ps2_device = { const device_t esdi_ps2_device = {
.name = "IBM PS/2 ESDI Fixed Disk Adapter (MCA)", .name = "IBM PS/2 ESDI Fixed Disk Adapter (MCA)",
.internal_name = "esdi_mca", .internal_name = "esdi_mca",

69
src/disk/hdc_ide.c
View File

@@ -3062,7 +3062,6 @@ ide_close(void *priv)
} }
} }
const device_t ide_isa_device = { const device_t ide_isa_device = {
.name = "ISA PC/AT IDE Controller", .name = "ISA PC/AT IDE Controller",
.internal_name = "ide_isa", .internal_name = "ide_isa",
@@ -3150,42 +3149,54 @@ const device_t ide_pci_2ch_device = {
// clang-format off // clang-format off
static const device_config_t ide_ter_config[] = { static const device_config_t ide_ter_config[] = {
{ {
"irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 }, .name = "irq",
{ .description = "IRQ",
{ "Plug and Play", -1 }, .type = CONFIG_SELECTION,
{ "IRQ 2", 2 }, .default_string = "",
{ "IRQ 3", 3 }, .default_int = 10,
{ "IRQ 4", 4 }, .file_filter = "",
{ "IRQ 5", 5 }, .spinner = { 0 },
{ "IRQ 7", 7 }, .selection = {
{ "IRQ 9", 9 }, { .description = "Plug and Play", .value = -1 },
{ "IRQ 10", 10 }, { .description = "IRQ 2", .value = 2 },
{ "IRQ 11", 11 }, { .description = "IRQ 3", .value = 3 },
{ "IRQ 12", 12 }, { .description = "IRQ 4", .value = 4 },
{ "" } { .description = "IRQ 5", .value = 5 },
{ .description = "IRQ 7", .value = 7 },
{ .description = "IRQ 9", .value = 9 },
{ .description = "IRQ 10", .value = 10 },
{ .description = "IRQ 11", .value = 11 },
{ .description = "IRQ 12", .value = 12 },
{ .description = "" }
} }
}, },
{ "", "", -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
static const device_config_t ide_qua_config[] = { static const device_config_t ide_qua_config[] = {
{ {
"irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, .name = "irq",
{ .description = "IRQ",
{ "Plug and Play", -1 }, .type = CONFIG_SELECTION,
{ "IRQ 2", 2 }, .default_string = "",
{ "IRQ 3", 3 }, .default_int = 11,
{ "IRQ 4", 4 }, .file_filter = "",
{ "IRQ 5", 5 }, .spinner = { 0 },
{ "IRQ 7", 7 }, .selection = {
{ "IRQ 9", 9 }, { .description = "Plug and Play", .value = -1 },
{ "IRQ 10", 10 }, { .description = "IRQ 2", .value = 2 },
{ "IRQ 11", 11 }, { .description = "IRQ 3", .value = 3 },
{ "IRQ 12", 12 }, { .description = "IRQ 4", .value = 4 },
{ "" } { .description = "IRQ 5", .value = 5 },
{ .description = "IRQ 7", .value = 7 },
{ .description = "IRQ 9", .value = 9 },
{ .description = "IRQ 10", .value = 10 },
{ .description = "IRQ 11", .value = 11 },
{ .description = "IRQ 12", .value = 12 },
{ .description = "" }
} }
}, },
{ "", "", -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
// clang-format on // clang-format on

1
src/disk/hdc_ide_cmd640.c
View File

@@ -491,7 +491,6 @@ cmd640_init(const device_t *info)
return dev; return dev;
} }
const device_t ide_cmd640_vlb_device = { const device_t ide_cmd640_vlb_device = {
.name = "CMD PCI-0640B VLB", .name = "CMD PCI-0640B VLB",
.internal_name = "ide_cmd640_vlb", .internal_name = "ide_cmd640_vlb",

1
src/disk/hdc_ide_cmd646.c
View File

@@ -406,7 +406,6 @@ cmd646_init(const device_t *info)
return dev; return dev;
} }
const device_t ide_cmd646_device = { const device_t ide_cmd646_device = {
.name = "CMD PCI-0646", .name = "CMD PCI-0646",
.internal_name = "ide_cmd646", .internal_name = "ide_cmd646",

1
src/disk/hdc_ide_opti611.c
View File

@@ -311,7 +311,6 @@ opti611_init(const device_t *info)
return dev; return dev;
} }
const device_t ide_opti611_vlb_device = { const device_t ide_opti611_vlb_device = {
.name = "OPTi 82C611/82C611A VLB", .name = "OPTi 82C611/82C611A VLB",
.internal_name = "ide_opti611_vlb", .internal_name = "ide_opti611_vlb",

1
src/disk/hdc_ide_sff8038i.c
View File

@@ -584,7 +584,6 @@ static void
return dev; return dev;
} }
const device_t sff8038i_device = const device_t sff8038i_device =
{ {
.name = "SFF-8038i IDE Bus Master", .name = "SFF-8038i IDE Bus Master",

1
src/disk/hdc_st506_at.c
View File

@@ -767,7 +767,6 @@ mfm_close(void *priv)
ui_sb_update_icon(SB_HDD|HDD_BUS_MFM, 0); ui_sb_update_icon(SB_HDD|HDD_BUS_MFM, 0);
} }
const device_t st506_at_wd1003_device = { const device_t st506_at_wd1003_device = {
.name = "WD1003 AT MFM/RLL Controller", .name = "WD1003 AT MFM/RLL Controller",
.internal_name = "st506_at", .internal_name = "st506_at",

220
src/disk/hdc_st506_xt.c
View File

@@ -1638,122 +1638,194 @@ wd1004a_27x_available(void)
// clang-format off // clang-format off
static const device_config_t dtc_config[] = { static const device_config_t dtc_config[] = {
{ {
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, .name = "bios_addr",
{ .description = "BIOS address",
{ "Disabled", 0x00000 }, .type = CONFIG_HEX20,
{ "C800H", 0xc8000 }, .default_string = "",
{ "CA00H", 0xca000 }, .default_int = 0xc8000,
{ "D800H", 0xd8000 }, .file_filter = "",
{ "F400H", 0xf4000 }, .spinner = { 0 },
{ "" } .selection = {
{ .description = "Disabled", .value = 0x00000 },
{ .description = "C800H", .value = 0xc8000 },
{ .description = "CA00H", .value = 0xca000 },
{ .description = "D800H", .value = 0xd8000 },
{ .description = "F400H", .value = 0xf4000 },
{ .description = "" }
} }
}, },
{ "", "", -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
static const device_config_t st11_config[] = { static const device_config_t st11_config[] = {
{ {
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, .name = "base",
{ .description = "Address",
{ "320H", 0x0320 }, .type = CONFIG_HEX16,
{ "324H", 0x0324 }, .default_string = "",
{ "328H", 0x0328 }, .default_int = 0x0320,
{ "32CH", 0x032c }, .file_filter = "",
{ "" } .spinner = { 0 },
.selection = {
{ .description = "320H", .value = 0x0320 },
{ .description = "324H", .value = 0x0324 },
{ .description = "328H", .value = 0x0328 },
{ .description = "32CH", .value = 0x032c },
{ .description = "" }
} }
}, },
{ {
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, .name = "irq",
{ .description = "IRQ",
{ "IRQ 2", 2 }, .type = CONFIG_SELECTION,
{ "IRQ 5", 5 }, .default_string = "",
{ "" } .default_int = 5,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "IRQ 2", .value = 2 },
{ .description = "IRQ 5", .value = 5 },
{ .description = "" }
} }
}, },
{ {
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, .name = "bios_addr",
{ .description = "BIOS address",
{ "Disabled", 0x00000 }, .type = CONFIG_HEX20,
{ "C800H", 0xc8000 }, .default_string = "",
{ "D000H", 0xd0000 }, .default_int = 0xc8000,
{ "D800H", 0xd8000 }, .file_filter = "",
{ "E000H", 0xe0000 }, .spinner = { 0 },
{ "" } .selection = {
{ .description = "Disabled", .value = 0x00000 },
{ .description = "C800H", .value = 0xc8000 },
{ .description = "D000H", .value = 0xd0000 },
{ .description = "D800H", .value = 0xd8000 },
{ .description = "E000H", .value = 0xe0000 },
{ .description = "" }
} }
}, },
{ {
"revision", "Board Revision", CONFIG_SELECTION, "", 19, "", { 0 }, .name = "revision",
{ .description = "Board Revision",
{ "Rev. 05 (v1.7)", 5 }, .type = CONFIG_SELECTION,
{ "Rev. 19 (v2.0)", 19 }, .default_string = "",
{ "" } .default_int = 19,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "Rev. 05 (v1.7)", .value = 5 },
{ .description = "Rev. 19 (v2.0)", .value = 19 },
{ .description = "" }
} }
}, },
{ "", "", -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
static const device_config_t wd_config[] = { static const device_config_t wd_config[] = {
{ {
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, .name = "bios_addr",
{ .description = "BIOS address",
{ "Disabled", 0x00000 }, .type = CONFIG_HEX20,
{ "C800H", 0xc8000 }, .default_string = "",
{ "" } .default_int = 0xc8000,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "Disabled", .value = 0x00000 },
{ .description = "C800H", .value = 0xc8000 },
{ .description = "" }
} }
}, },
{ {
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, .name = "base",
{ .description = "Address",
{ "320H", 0x0320 }, .type = CONFIG_HEX16,
{ "324H", 0x0324 }, .default_string = "",
{ "" } .default_int = 0x0320,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "320H", .value = 0x0320 },
{ .description = "324H", .value = 0x0324 },
{ .description = "" }
} }
}, },
{ {
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, .name = "irq",
{ .description = "IRQ",
{ "IRQ 2", 2 }, .type = CONFIG_SELECTION,
{ "IRQ 5", 5 }, .default_string = "",
{ "" } .default_int = 5,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "IRQ 2", .value = 2 },
{ .description = "IRQ 5", .value = 5 },
{ .description = "" }
} }
}, },
{ "", "", -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
static const device_config_t wd_rll_config[] = { static const device_config_t wd_rll_config[] = {
{ {
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, .name = "bios_addr",
{ .description = "BIOS address",
{ "Disabled", 0x00000 }, .type = CONFIG_HEX20,
{ "C800H", 0xc8000 }, .default_string = "",
{ "" } .default_int = 0xc8000,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "Disabled", .value = 0x00000 },
{ .description = "C800H", .value = 0xc8000 },
{ .description = "" }
} }
}, },
{ {
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, .name = "base",
{ .description = "Address",
{ "320H", 0x0320 }, .type = CONFIG_HEX16,
{ "324H", 0x0324 }, .default_string = "",
{ "" } .default_int = 0x0320,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "320H", .value = 0x0320 },
{ .description = "324H", .value = 0x0324 },
{ .description = "" }
} }
}, },
{ {
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, .name = "irq",
{ .description = "IRQ",
{ "IRQ 2", 2 }, .type = CONFIG_SELECTION,
{ "IRQ 5", 5 }, .default_string = "",
{ "" } .default_int = 5,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "IRQ 2", .value = 2 },
{ .description = "IRQ 5", .value = 5 },
{ .description = "" }
} }
}, },
{ {
"translate", "Translate 26 -> 17", CONFIG_SELECTION, "", 0, "", { 0 }, .name = "translate",
{ .description = "Translate 26 -> 17",
{ "Off", 0 }, .type = CONFIG_SELECTION,
{ "On", 1 }, .default_string = "",
{ "" } .default_int = 0,
.file_filter = "",
.spinner = { 0 },
.selection = {
{ .description = "Off", .value = 0 },
{ .description = "On", .value = 1 },
{ .description = "" }
} }
}, },
{ "", "", -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
static const device_config_t wd1004a_config[] = { static const device_config_t wd1004a_config[] = {
@@ -1799,7 +1871,7 @@ static const device_config_t wd1004a_config[] = {
{ .description = "" } { .description = "" }
} }
}, },
{ .name = "", .description = "", .type = -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
static const device_config_t wd1004_rll_config[] = { static const device_config_t wd1004_rll_config[] = {
@@ -1864,7 +1936,7 @@ static const device_config_t wd1004_rll_config[] = {
{ .description = "" } { .description = "" }
} }
}, },
{ .name = "", .description = "", .type = -1 } { .name = "", .description = "", .type = CONFIG_END }
}; };
// clang-format on // clang-format on

51
src/disk/hdc_xta.c
View File

@@ -1102,34 +1102,51 @@ xta_close(void *priv)
free(dev); free(dev);
} }
static const device_config_t wdxt150_config[] = { static const device_config_t wdxt150_config[] = {
// clang-format off // clang-format off
{ {
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, /*W2*/ .name = "base",
{ .description = "Address",
{ "320H", 0x0320 }, .type = CONFIG_HEX16,
{ "324H", 0x0324 }, .default_string = "",
{ "" } .default_int = 0x0320,
.file_filter = "",
.spinner = { 0 }, /*W2*/
.selection = {
{ .description = "320H", .value = 0x0320 },
{ .description = "324H", .value = 0x0324 },
{ .description = "" }
}, },
}, },
{ {
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, /*W3*/ .name = "irq",
{ .description = "IRQ",
{ "IRQ 5", 5 }, .type = CONFIG_SELECTION,
{ "IRQ 4", 4 }, .default_string = "",
{ "" } .default_int = 5,
.file_filter = "",
.spinner = { 0 }, /*W3*/
.selection = {
{ .description = "IRQ 5", .value = 5 },
{ .description = "IRQ 4", .value = 4 },
{ .description = "" }
}, },
}, },
{ {
"bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, /*W1*/ .name = "bios_addr",
{ .description = "BIOS Address",
{ "C800H", 0xc8000 }, .type = CONFIG_HEX20,
{ "CA00H", 0xca000 }, .default_string = "",
{ "" } .default_int = 0xc8000,
.file_filter = "",
.spinner = { 0 }, /*W1*/
.selection = {
{ .description = "C800H", .value = 0xc8000 },
{ .description = "CA00H", .value = 0xca000 },
{ .description = "" }
}, },
}, },
{ "", "", -1 } { .name = "", .description = "", .type = CONFIG_END }
// clang-format off // clang-format off
}; };

1
src/disk/hdc_xtide.c
View File

@@ -259,7 +259,6 @@ xtide_at_close(void *priv)
free(xtide); free(xtide);
} }
const device_t xtide_device = { const device_t xtide_device = {
.name = "PC/XT XTIDE", .name = "PC/XT XTIDE",
.internal_name = "xtide", .internal_name = "xtide",