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

refactored device_t and all declarations

Browse Source
This commit is contained in:
Jess Lovelace
2022-01-13 21:06:11 -05:00
parent 8bb18ef598
commit f18615ae87
219 changed files with 707 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/disk/hdc.c
View File

@@ -87,7 +87,7 @@ inthdc_close(void *priv)
static const device_t inthdc_device = {
"Internal controller", 0, 0,
"Internal controller", "inthdc", 0, 0,
inthdc_init, inthdc_close, NULL,
{ NULL }, NULL, NULL, NULL
};

1
src/disk/hdc_esdi_at.c
View File

@@ -846,6 +846,7 @@ wd1007vse1_available(void)
const device_t esdi_at_wd1007vse1_device = {
"Western Digital WD1007V-SE1 (ESDI)",
"esdi_at_wd1007vse1",
DEVICE_ISA | DEVICE_AT,
0,
wd1007vse1_init, wd1007vse1_close, NULL,

1
src/disk/hdc_esdi_mca.c
View File

@@ -1181,6 +1181,7 @@ esdi_available(void)
const device_t esdi_ps2_device = {
"IBM PS/2 ESDI Fixed Disk Adapter (MCA)",
"esdi_ps2"
DEVICE_MCA, 0,
esdi_init, esdi_close, NULL,
{ esdi_available }, NULL, NULL, NULL

10
src/disk/hdc_ide.c
View File

@@ -3035,6 +3035,7 @@ ide_close(void *priv)
const device_t ide_isa_device = {
"ISA PC/AT IDE Controller",
"ide_isa",
DEVICE_ISA | DEVICE_AT,
0,
ide_init, ide_close, ide_reset,
@@ -3043,6 +3044,7 @@ const device_t ide_isa_device = {
const device_t ide_isa_2ch_device = {
"ISA PC/AT IDE Controller (Dual-Channel)",
"ide_isa_2ch",
DEVICE_ISA | DEVICE_AT,
1,
ide_init, ide_close, ide_reset,
@@ -3051,6 +3053,7 @@ const device_t ide_isa_2ch_device = {
const device_t ide_vlb_device = {
"VLB IDE Controller",
"ide_vlb",
DEVICE_VLB | DEVICE_AT,
2,
ide_init, ide_close, ide_reset,
@@ -3059,6 +3062,7 @@ const device_t ide_vlb_device = {
const device_t ide_vlb_2ch_device = {
"VLB IDE Controller (Dual-Channel)",
"ide_vlb_2ch",
DEVICE_VLB | DEVICE_AT,
3,
ide_init, ide_close, ide_reset,
@@ -3067,6 +3071,7 @@ const device_t ide_vlb_2ch_device = {
const device_t ide_pci_device = {
"PCI IDE Controller",
"ide_pci",
DEVICE_PCI | DEVICE_AT,
4,
ide_init, ide_close, ide_reset,
@@ -3075,6 +3080,7 @@ const device_t ide_pci_device = {
const device_t ide_pci_2ch_device = {
"PCI IDE Controller (Dual-Channel)",
"ide_pci_2ch",
DEVICE_PCI | DEVICE_AT,
5,
ide_init, ide_close, ide_reset,
@@ -3173,6 +3179,7 @@ static const device_config_t ide_qua_config[] =
const device_t ide_ter_device = {
"Tertiary IDE Controller",
"ide_ter",
DEVICE_AT,
0,
ide_ter_init, ide_ter_close, NULL,
@@ -3182,6 +3189,7 @@ const device_t ide_ter_device = {
const device_t ide_ter_pnp_device = {
"Tertiary IDE Controller (Plug and Play only)",
"ide_ter_pnp",
DEVICE_AT,
1,
ide_ter_init, ide_ter_close, NULL,
@@ -3191,6 +3199,7 @@ const device_t ide_ter_pnp_device = {
const device_t ide_qua_device = {
"Quaternary IDE Controller",
"ide_qua",
DEVICE_AT,
0,
ide_qua_init, ide_qua_close, NULL,
@@ -3200,6 +3209,7 @@ const device_t ide_qua_device = {
const device_t ide_qua_pnp_device = {
"Quaternary IDE Controller (Plug and Play only)",
"ide_qua_pnp",
DEVICE_AT,
1,
ide_qua_init, ide_qua_close, NULL,

5
src/disk/hdc_ide_cmd640.c
View File

@@ -494,6 +494,7 @@ cmd640_init(const device_t *info)
const device_t ide_cmd640_vlb_device = {
"CMD PCI-0640B VLB",
"ide_cmd640_vlb",
DEVICE_VLB,
0x0078,
cmd640_init, cmd640_close, cmd640_reset,
@@ -503,6 +504,7 @@ const device_t ide_cmd640_vlb_device = {
const device_t ide_cmd640_vlb_178_device = {
"CMD PCI-0640B VLB (Port 178h)",
"ide_cmd640_vlb_178",
DEVICE_VLB,
0x0178,
cmd640_init, cmd640_close, cmd640_reset,
@@ -512,6 +514,7 @@ const device_t ide_cmd640_vlb_178_device = {
const device_t ide_cmd640_pci_device = {
"CMD PCI-0640B PCI",
"ide_cmd640_pci",
DEVICE_PCI,
0x0a,
cmd640_init, cmd640_close, cmd640_reset,
@@ -521,6 +524,7 @@ const device_t ide_cmd640_pci_device = {
const device_t ide_cmd640_pci_legacy_only_device = {
"CMD PCI-0640B PCI (Legacy Mode Only)",
"ide_cmd640_pci_legacy_only",
DEVICE_PCI,
0x00,
cmd640_init, cmd640_close, cmd640_reset,
@@ -530,6 +534,7 @@ const device_t ide_cmd640_pci_legacy_only_device = {
const device_t ide_cmd640_pci_single_channel_device = {
"CMD PCI-0640B PCI",
"ide_cmd640_pci_single_channel",
DEVICE_PCI,
0x2000a,
cmd640_init, cmd640_close, cmd640_reset,

3
src/disk/hdc_ide_cmd646.c
View File

@@ -409,6 +409,7 @@ cmd646_init(const device_t *info)
const device_t ide_cmd646_device = {
"CMD PCI-0646",
"ide_cmd646",
DEVICE_PCI,
0x8a,
cmd646_init, cmd646_close, cmd646_reset,
@@ -418,6 +419,7 @@ const device_t ide_cmd646_device = {
const device_t ide_cmd646_legacy_only_device = {
"CMD PCI-0646 (Legacy Mode Only)",
"ide_cmd646_legacy_only",
DEVICE_PCI,
0x80,
cmd646_init, cmd646_close, cmd646_reset,
@@ -427,6 +429,7 @@ const device_t ide_cmd646_legacy_only_device = {
const device_t ide_cmd646_single_channel_device = {
"CMD PCI-0646",
"ide_cmd646_single_channel",
DEVICE_PCI,
0x2008a,
cmd646_init, cmd646_close, cmd646_reset,

1
src/disk/hdc_ide_opti611.c
View File

@@ -314,6 +314,7 @@ opti611_init(const device_t *info)
const device_t ide_opti611_vlb_device = {
"OPTi 82C611/82C611A VLB",
"ide_opti611_vlb",
0,
0,
opti611_init, opti611_close, NULL,

1
src/disk/hdc_ide_sff8038i.c
View File

@@ -588,6 +588,7 @@ static void
const device_t sff8038i_device =
{
"SFF-8038i IDE Bus Master",
"sff8038i",
DEVICE_PCI,
0,
sff_init,

1
src/disk/hdc_st506_at.c
View File

@@ -770,6 +770,7 @@ mfm_close(void *priv)
const device_t st506_at_wd1003_device = {
"WD1003 AT MFM/RLL Controller",
"st506_at_wd1003",
DEVICE_ISA | DEVICE_AT,
0,
mfm_init, mfm_close, NULL,

6
src/disk/hdc_st506_xt.c
View File

@@ -1834,6 +1834,7 @@ static const device_config_t wd_rll_config[] = {
const device_t st506_xt_xebec_device = {
"IBM PC Fixed Disk Adapter (MFM)",
"st506_xt_xebec",
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 0,
st506_init, st506_close, NULL,
@@ -1844,6 +1845,7 @@ const device_t st506_xt_xebec_device = {
const device_t st506_xt_dtc5150x_device = {
"DTC 5150X MFM Fixed Disk Adapter",
"st506_xt_dtc5150x",
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 1,
st506_init, st506_close, NULL,
@@ -1854,6 +1856,7 @@ const device_t st506_xt_dtc5150x_device = {
const device_t st506_xt_st11_m_device = {
"ST-11M MFM Fixed Disk Adapter",
"st506_xt_st11_m",
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 11,
st506_init, st506_close, NULL,
@@ -1864,6 +1867,7 @@ const device_t st506_xt_st11_m_device = {
const device_t st506_xt_st11_r_device = {
"ST-11R RLL Fixed Disk Adapter",
"st506_xt_st11_r",
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 12,
st506_init, st506_close, NULL,
@@ -1874,6 +1878,7 @@ const device_t st506_xt_st11_r_device = {
const device_t st506_xt_wd1002a_wx1_device = {
"WD1002A-WX1 MFM Fixed Disk Adapter",
"st506_xt_wd1002a_wx1",
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 21,
st506_init, st506_close, NULL,
@@ -1884,6 +1889,7 @@ const device_t st506_xt_wd1002a_wx1_device = {
const device_t st506_xt_wd1002a_27x_device = {
"WD1002A-27X RLL Fixed Disk Adapter",
"st506_xt_wd1002a_27x",
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 22,
st506_init, st506_close, NULL,

2
src/disk/hdc_xta.c
View File

@@ -1154,6 +1154,7 @@ static const device_config_t wdxt150_config[] = {
const device_t xta_wdxt150_device = {
"WDXT-150 XTA Fixed Disk Controller",
"xta_wdxt150",
DEVICE_ISA,
0,
xta_init, xta_close, NULL,
@@ -1164,6 +1165,7 @@ const device_t xta_wdxt150_device = {
const device_t xta_hd20_device = {
"EuroPC HD20 Fixed Disk Controller",
"xta_hd20",
DEVICE_ISA,
1,
xta_init, xta_close, NULL,

5
src/disk/hdc_xtide.c
View File

@@ -262,6 +262,7 @@ xtide_at_close(void *priv)
const device_t xtide_device = {
"PC/XT XTIDE",
"xtide",
DEVICE_ISA,
0,
xtide_init, xtide_close, NULL,
@@ -271,6 +272,7 @@ const device_t xtide_device = {
const device_t xtide_at_device = {
"PC/AT XTIDE",
"xtide_at",
DEVICE_ISA | DEVICE_AT,
0,
xtide_at_init, xtide_at_close, NULL,
@@ -280,6 +282,7 @@ const device_t xtide_at_device = {
const device_t xtide_at_386_device = {
"PC/AT XTIDE (386)",
"xtide_at_386",
DEVICE_ISA | DEVICE_AT,
1,
xtide_at_init, xtide_at_close, NULL,
@@ -289,6 +292,7 @@ const device_t xtide_at_386_device = {
const device_t xtide_acculogic_device = {
"Acculogic XT IDE",
"xtide_acculogic",
DEVICE_ISA,
0,
xtide_acculogic_init, xtide_close, NULL,
@@ -298,6 +302,7 @@ const device_t xtide_acculogic_device = {
const device_t xtide_at_ps2_device = {
"PS/2 AT XTIDE (1.1.5)",
"xtide_at_ps2",
DEVICE_ISA | DEVICE_AT,
0,
xtide_at_ps2_init, xtide_at_close, NULL,