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

WARNING: CONFIGS MIGHT PARTIALLY BREAK WHERE DEVICE NAMES HAVE CHANGED.

Browse Source 
Changes to device_t struct to accomodate the upcoming PCI IRQ arbitration rewrite;
Added device.c/h API to obtain name from the device_t struct;
Significant changes to win/win_settings.c to clean up the code a bit and fix bugs;
Ported all the CPU and AudioPCI commits from PCem;
Added an API call to allow ACPI soft power off to gracefully stop the emulator;
Removed the Siemens PCD-2L from the Dev branch because it now works;
Removed the Socket 5 HP Vectra from the Dev branch because it now works;
Fixed the Compaq Presario and the Micronics Spitfire;
Give the IBM PC330 its own list of 486 CPU so it can have DX2's with CPUID 0x470;
SMM fixes;
Rewrote the SYSENTER, SYSEXIT, SYSCALL, and SYSRET instructions;
Changed IDE reset period to match the specification, fixes #929;
The keyboard input and output ports are now forced in front of the queue when read, fixes a number of bugs, including the AMI Apollo hanging on soft reset;
Added the Intel AN430TX but Dev branched because it does not work;
The network code no longer drops packets if the emulated network card has failed to receive them (eg. when the buffer is full);
Changes to PCI card adding and renamed some PCI slot types, also added proper AGP bridge slot types;
USB UHCI emulation is no longer a stub (still doesn't fully work, but at least Windows XP chk with Debug no longer ASSERT's on it);
Fixed NVR on the the SMC FDC37C932QF and APM variants;
A number of fixes to Intel 4x0 chipsets, including fixing every register of the 440LX and 440EX;
Some ACPI changes.
This commit is contained in:
OBattler
2020-11-16 00:01:21 +01:00
parent 745460f64b
commit 0faf6692c9
260 changed files with 5122 additions and 4471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/disk/hdc.c
View File

@@ -69,7 +69,7 @@ null_close(void *priv)
static const device_t null_device = {
"Null HDC", 0, 0,
null_init, null_close, NULL,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
@@ -89,83 +89,37 @@ inthdc_close(void *priv)
static const device_t inthdc_device = {
"Internal controller", 0, 0,
inthdc_init, inthdc_close, NULL,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
static const struct {
const char *name;
const char *internal_name;
const device_t *device;
} controllers[] = {
{ "None", "none",
&null_device },
{ "Internal controller", "internal",
&inthdc_device },
{ "[ISA] [MFM] IBM PC Fixed Disk Adapter", "st506_xt",
&st506_xt_xebec_device },
{ "[ISA] [MFM] DTC-5150X Fixed Disk Adapter", "st506_xt_dtc5150x",
&st506_xt_dtc5150x_device },
{ "[ISA] [MFM] ST-11M Fixed Disk Adapter", "st506_xt_st11_m",
&st506_xt_st11_m_device },
{ "[ISA] [MFM] WD1002A-WX1 Fixed Disk Adapter", "st506_xt_wd1002a_wx1",
&st506_xt_wd1002a_wx1_device },
{ "[ISA] [MFM/RLL] IBM PC/AT Fixed Disk Adapter", "st506_at",
&st506_at_wd1003_device },
{ "[ISA] [RLL] ST-11R Fixed Disk Adapter", "st506_xt_st11_r",
&st506_xt_st11_r_device },
{ "[ISA] [RLL] WD1002A-27X Fixed Disk Adapter", "st506_xt_wd1002a_27x",
&st506_xt_wd1002a_27x_device },
{ "[ISA] [ESDI] PC/AT ESDI Fixed Disk Adapter", "esdi_at",
&esdi_at_wd1007vse1_device },
{ "[ISA] [IDE] PC/AT IDE Adapter", "ide_isa",
&ide_isa_device },
{ "[ISA] [IDE] PC/AT IDE Adapter (Dual-Channel)", "ide_isa_2ch",
&ide_isa_2ch_device },
{ "[ISA] [IDE] PC/AT XTIDE", "xtide_at",
&xtide_at_device },
{ "[ISA] [IDE] PS/2 AT XTIDE (1.1.5)", "xtide_at_ps2",
&xtide_at_ps2_device },
{ "[ISA] [IDE] WDXT-150 IDE (XTA) Adapter", "xta_wdxt150",
&xta_wdxt150_device },
{ "[ISA] [XT IDE] Acculogic XT IDE", "xtide_acculogic",
&xtide_acculogic_device },
{ "[ISA] [XT IDE] PC/XT XTIDE", "xtide",
&xtide_device },
{ "[MCA] [ESDI] IBM PS/2 ESDI Fixed Disk Adapter","esdi_mca",
&esdi_ps2_device },
{ "[PCI] [IDE] PCI IDE Adapter", "ide_pci",
&ide_pci_device },
{ "[PCI] [IDE] PCI IDE Adapter (Dual-Channel)", "ide_pci_2ch",
&ide_pci_2ch_device },
{ "[VLB] [IDE] PC/AT IDE Adapter", "vlb_isa",
&ide_vlb_device },
{ "[VLB] [IDE] PC/AT IDE Adapter (Dual-Channel)", "vlb_isa_2ch",
&ide_vlb_2ch_device },
{ "", "",
NULL }
{ "none", &null_device },
{ "internal", &inthdc_device },
{ "st506_xt", &st506_xt_xebec_device },
{ "st506_xt_dtc5150x", &st506_xt_dtc5150x_device },
{ "st506_xt_st11_m", &st506_xt_st11_m_device },
{ "st506_xt_wd1002a_wx1", &st506_xt_wd1002a_wx1_device },
{ "st506_at", &st506_at_wd1003_device },
{ "st506_xt_st11_r", &st506_xt_st11_r_device },
{ "st506_xt_wd1002a_27x", &st506_xt_wd1002a_27x_device },
{ "esdi_at", &esdi_at_wd1007vse1_device },
{ "ide_isa", &ide_isa_device },
{ "ide_isa_2ch", &ide_isa_2ch_device },
{ "xtide_at", &xtide_at_device },
{ "xtide_at_ps2", &xtide_at_ps2_device },
{ "xta_wdxt150", &xta_wdxt150_device },
{ "xtide_acculogic", &xtide_acculogic_device },
{ "xtide", &xtide_device },
{ "esdi_mca", &esdi_ps2_device },
{ "ide_pci", &ide_pci_device },
{ "ide_pci_2ch", &ide_pci_2ch_device },
{ "vlb_isa", &ide_vlb_device },
{ "vlb_isa_2ch", &ide_vlb_2ch_device },
{ "", NULL }
};
@@ -199,13 +153,6 @@ hdc_reset(void)
}
char *
hdc_get_name(int hdc)
{
return((char *) controllers[hdc].name);
}
char *
hdc_get_internal_name(int hdc)
{
@@ -213,22 +160,6 @@ hdc_get_internal_name(int hdc)
}
int
hdc_get_id(char *s)
{
int c = 0;
while (strlen((char *) controllers[c].name))
{
if (!strcmp((char *) controllers[c].name, s))
return c;
c++;
}
return 0;
}
int
hdc_get_from_internal_name(char *s)
{