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

Merge remote-tracking branch 'origin/master' into cdrom_changes

Browse Source
This commit is contained in:
OBattler
2025-02-14 07:40:18 +01:00
parent a96437753c 2c197000ea
commit c8d88d1dd0
40 changed files with 167 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/disk/hdc_esdi_at.c
View File

@@ -984,7 +984,7 @@ wd1007vse1_available(void)
const device_t esdi_at_wd1007vse1_device = {
.name = "Western Digital WD1007V-SE1 (ESDI)",
.internal_name = "esdi_at",
.flags = DEVICE_ISA | DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = wd1007vse1_init,
.close = wd1007vse1_close,

26
src/disk/hdc_ide.c
View File

@@ -3447,7 +3447,7 @@ mcide_close(void *priv)
const device_t ide_isa_device = {
.name = "ISA PC/AT IDE Controller",
.internal_name = "ide_isa",
.flags = DEVICE_ISA | DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = ide_init,
.close = ide_close,
@@ -3461,7 +3461,7 @@ const device_t ide_isa_device = {
const device_t ide_isa_sec_device = {
.name = "ISA PC/AT IDE Controller (Secondary)",
.internal_name = "ide_isa_sec",
.flags = DEVICE_ISA | DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = ide_sec_init,
.close = ide_sec_close,
@@ -3475,7 +3475,7 @@ const device_t ide_isa_sec_device = {
const device_t ide_isa_2ch_device = {
.name = "ISA PC/AT IDE Controller (Dual-Channel)",
.internal_name = "ide_isa_2ch",
.flags = DEVICE_ISA | DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 1,
.init = ide_init,
.close = ide_close,
@@ -3489,7 +3489,7 @@ const device_t ide_isa_2ch_device = {
const device_t ide_vlb_device = {
.name = "VLB IDE Controller",
.internal_name = "ide_vlb",
.flags = DEVICE_VLB | DEVICE_AT,
.flags = DEVICE_VLB | DEVICE_ISA16,
.local = 2,
.init = ide_init,
.close = ide_close,
@@ -3503,7 +3503,7 @@ const device_t ide_vlb_device = {
const device_t ide_vlb_sec_device = {
.name = "VLB IDE Controller (Secondary)",
.internal_name = "ide_vlb_sec",
.flags = DEVICE_VLB | DEVICE_AT,
.flags = DEVICE_VLB | DEVICE_ISA16,
.local = 2,
.init = ide_sec_init,
.close = ide_sec_close,
@@ -3517,7 +3517,7 @@ const device_t ide_vlb_sec_device = {
const device_t ide_vlb_2ch_device = {
.name = "VLB IDE Controller (Dual-Channel)",
.internal_name = "ide_vlb_2ch",
.flags = DEVICE_VLB | DEVICE_AT,
.flags = DEVICE_VLB | DEVICE_ISA16,
.local = 3,
.init = ide_init,
.close = ide_close,
@@ -3531,7 +3531,7 @@ const device_t ide_vlb_2ch_device = {
const device_t ide_pci_device = {
.name = "PCI IDE Controller",
.internal_name = "ide_pci",
.flags = DEVICE_PCI | DEVICE_AT,
.flags = DEVICE_PCI | DEVICE_ISA16,
.local = 4,
.init = ide_init,
.close = ide_close,
@@ -3545,7 +3545,7 @@ const device_t ide_pci_device = {
const device_t ide_pci_sec_device = {
.name = "PCI IDE Controller (Secondary)",
.internal_name = "ide_pci_sec",
.flags = DEVICE_PCI | DEVICE_AT,
.flags = DEVICE_PCI | DEVICE_ISA16,
.local = 4,
.init = ide_sec_init,
.close = ide_sec_close,
@@ -3559,7 +3559,7 @@ const device_t ide_pci_sec_device = {
const device_t ide_pci_2ch_device = {
.name = "PCI IDE Controller (Dual-Channel)",
.internal_name = "ide_pci_2ch",
.flags = DEVICE_PCI | DEVICE_AT,
.flags = DEVICE_PCI | DEVICE_ISA16,
.local = 5,
.init = ide_init,
.close = ide_close,
@@ -3643,7 +3643,7 @@ static const device_config_t ide_qua_config[] = {
const device_t ide_ter_device = {
.name = "Tertiary IDE Controller",
.internal_name = "ide_ter",
.flags = DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = ide_ter_init,
.close = ide_ter_close,
@@ -3657,7 +3657,7 @@ const device_t ide_ter_device = {
const device_t ide_ter_pnp_device = {
.name = "Tertiary IDE Controller (Plug and Play only)",
.internal_name = "ide_ter_pnp",
.flags = DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 1,
.init = ide_ter_init,
.close = ide_ter_close,
@@ -3671,7 +3671,7 @@ const device_t ide_ter_pnp_device = {
const device_t ide_qua_device = {
.name = "Quaternary IDE Controller",
.internal_name = "ide_qua",
.flags = DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = ide_qua_init,
.close = ide_qua_close,
@@ -3685,7 +3685,7 @@ const device_t ide_qua_device = {
const device_t ide_qua_pnp_device = {
.name = "Quaternary IDE Controller (Plug and Play only)",
.internal_name = "ide_qua_pnp",
.flags = DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 1,
.init = ide_qua_init,
.close = ide_qua_close,

2
src/disk/hdc_st506_at.c
View File

@@ -795,7 +795,7 @@ mfm_close(void *priv)
const device_t st506_at_wd1003_device = {
.name = "WD1003 AT MFM/RLL Controller",
.internal_name = "st506_at",
.flags = DEVICE_ISA | DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = mfm_init,
.close = mfm_close,

4
src/disk/hdc_xtide.c
View File

@@ -312,7 +312,7 @@ const device_t xtide_device = {
const device_t xtide_at_device = {
.name = "PC/AT XTIDE",
.internal_name = "xtide_at",
.flags = DEVICE_ISA | DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = xtide_at_init,
.close = xtide_at_close,
@@ -340,7 +340,7 @@ const device_t xtide_acculogic_device = {
const device_t xtide_at_ps2_device = {
.name = "PS/2 AT XTIDE (1.1.5)",
.internal_name = "xtide_at_ps2",
.flags = DEVICE_ISA | DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = xtide_at_ps2_init,
.close = xtide_at_close,

2
src/disk/lba_enhancer.c
View File

@@ -88,7 +88,7 @@ static const device_config_t lba_enhancer_config[] = {
const device_t lba_enhancer_device = {
.name = "Vision Systems LBA Enhancer",
.internal_name = "lba_enhancer",
.flags = DEVICE_AT,
.flags = DEVICE_ISA16,
.local = 0,
.init = lba_enhancer_init,
.close = lba_enhancer_close,