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

Added a quaternary IDE controller on ports 1E8-1EF/3EE;

Browse Source 
The tertiary and quaternary IDE controllers are now fully configurable;
The IRQ of the RTL8029AS network card is now configurable;
CopyQM floppy images are now supported.
This commit is contained in:
OBattler
2016-12-28 23:34:00 +01:00
parent ad1fd0a5f6
commit 17e2cd6776
13 changed files with 1072 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/model.c
View File

@@ -431,7 +431,6 @@ void at_sis496_init()
memregs_init();
pci_init(PCI_CONFIG_TYPE_1, 0, 31);
device_add(&sis496_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_r418_init()
@@ -449,7 +448,6 @@ void at_premiere_common_init()
fdc37c665_init();
intel_batman_init();
device_add(&intel_flash_bxt_ami_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_batman_init()
@@ -483,7 +481,6 @@ void at_advanced_common_init()
i430fx_init();
piix_init(7);
pc87306_init();
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_endeavor_init()
@@ -508,7 +505,6 @@ void at_mb500n_init()
piix_init(7);
fdc37c665_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
#if 0
@@ -522,7 +518,6 @@ void at_powermate_v_init()
fdc37c665_init();
acerm3a_io_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
#endif
@@ -535,7 +530,6 @@ void at_p54tp4xe_init()
piix_init(7);
fdc37c665_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_acerm3a_init()
@@ -548,7 +542,6 @@ void at_acerm3a_init()
fdc37c932fr_init();
acerm3a_io_init();
device_add(&intel_flash_bxb_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_acerv35n_init()
@@ -561,7 +554,6 @@ void at_acerv35n_init()
fdc37c932fr_init();
acerm3a_io_init();
device_add(&intel_flash_bxb_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_p55t2p4_init()
@@ -573,7 +565,6 @@ void at_p55t2p4_init()
piix3_init(7);
w83877f_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_i430vx_init()
@@ -585,7 +576,6 @@ void at_i430vx_init()
piix3_init(7);
um8669f_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_p55tvp4_init()
@@ -597,8 +587,6 @@ void at_p55tvp4_init()
piix3_init(7);
w83877f_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_p55va_init()
@@ -610,7 +598,6 @@ void at_p55va_init()
piix3_init(7);
fdc37c932fr_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void at_i440fx_init()
@@ -622,7 +609,6 @@ void at_i440fx_init()
piix3_init(7);
fdc37c665_init();
device_add(&intel_flash_bxt_device);
if ((atapi_cdrom_channel >= 4) && (atapi_cdrom_channel <= 5) && cdrom_enabled && !scsi_cdrom_enabled) ide_ter_init();
}
void model_init()
@@ -632,7 +618,6 @@ void model_init()
io_init();
fdc_update_is_nsc(0);
ide_ter_enabled = 0;
models[model].init();
if (models[model].device)
device_add(models[model].device);