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)
{

2
src/disk/hdc_esdi_at.c
View File

@@ -849,7 +849,7 @@ const device_t esdi_at_wd1007vse1_device = {
DEVICE_ISA | DEVICE_AT,
0,
wd1007vse1_init, wd1007vse1_close, NULL,
wd1007vse1_available,
{ wd1007vse1_available },
NULL, NULL,
NULL
};

4
src/disk/hdc_esdi_mca.c
View File

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

24
src/disk/hdc_ide.c
View File

@@ -886,7 +886,7 @@ ide_set_board_callback(uint8_t board, double callback)
{
ide_board_t *dev = ide_boards[board];
ide_log("ide_set_callback(%i)\n", board);
ide_log("ide_set_board_callback(%i)\n", board);
if (!dev) {
ide_log("Set board callback failed\n");
@@ -1340,7 +1340,7 @@ ide_write_devctl(uint16_t addr, uint8_t val, void *priv)
ide->reset = 1;
ide_set_callback(ide, 0.0);
ide_set_callback(ide_other, 0.0);
ide_set_board_callback(ide->board, 500 * IDE_TIME);
ide_set_board_callback(ide->board, 1000.4); /* 1 ms + 400 ns, per the specification */
} else {
/* Currently active device is 1, simply reset the status and the active device. */
dev_reset(ide);
@@ -2848,7 +2848,7 @@ const device_t ide_isa_device = {
DEVICE_ISA | DEVICE_AT,
0,
ide_init, ide_close, ide_reset,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
const device_t ide_isa_2ch_device = {
@@ -2856,7 +2856,7 @@ const device_t ide_isa_2ch_device = {
DEVICE_ISA | DEVICE_AT,
1,
ide_init, ide_close, ide_reset,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
const device_t ide_vlb_device = {
@@ -2864,7 +2864,7 @@ const device_t ide_vlb_device = {
DEVICE_VLB | DEVICE_AT,
2,
ide_init, ide_close, ide_reset,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
const device_t ide_vlb_2ch_device = {
@@ -2872,7 +2872,7 @@ const device_t ide_vlb_2ch_device = {
DEVICE_VLB | DEVICE_AT,
3,
ide_init, ide_close, ide_reset,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
const device_t ide_pci_device = {
@@ -2880,7 +2880,7 @@ const device_t ide_pci_device = {
DEVICE_PCI | DEVICE_AT,
4,
ide_init, ide_close, ide_reset,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
const device_t ide_pci_2ch_device = {
@@ -2888,13 +2888,13 @@ const device_t ide_pci_2ch_device = {
DEVICE_PCI | DEVICE_AT,
5,
ide_init, ide_close, ide_reset,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};
static const device_config_t ide_ter_config[] =
{
{
"irq", "IRQ", CONFIG_SELECTION, "", 10,
"irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 },
{
{
"IRQ 2", 2
@@ -2936,7 +2936,7 @@ static const device_config_t ide_ter_config[] =
static const device_config_t ide_qua_config[] =
{
{
"irq", "IRQ", CONFIG_SELECTION, "", 11,
"irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 },
{
{
"IRQ 2", 2
@@ -2980,7 +2980,7 @@ const device_t ide_ter_device = {
DEVICE_AT,
0,
ide_ter_init, ide_ter_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
ide_ter_config
};
@@ -2989,6 +2989,6 @@ const device_t ide_qua_device = {
DEVICE_AT,
0,
ide_qua_init, ide_qua_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
ide_qua_config
};

10
src/disk/hdc_ide_cmd640.c
View File

@@ -442,7 +442,7 @@ const device_t ide_cmd640_vlb_device = {
DEVICE_VLB,
0x0078,
cmd640_init, cmd640_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};
@@ -451,7 +451,7 @@ const device_t ide_cmd640_vlb_178_device = {
DEVICE_VLB,
0x0178,
cmd640_init, cmd640_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};
@@ -460,7 +460,7 @@ const device_t ide_cmd640_pci_device = {
DEVICE_PCI,
0x0a,
cmd640_init, cmd640_close, cmd640_reset,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};
@@ -469,7 +469,7 @@ const device_t ide_cmd640_pci_legacy_only_device = {
DEVICE_PCI,
0x00,
cmd640_init, cmd640_close, cmd640_reset,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};
@@ -478,6 +478,6 @@ const device_t ide_cmd640_pci_single_channel_device = {
DEVICE_PCI,
0x2000a,
cmd640_init, cmd640_close, cmd640_reset,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};

2
src/disk/hdc_ide_opti611.c
View File

@@ -317,6 +317,6 @@ const device_t ide_opti611_vlb_device = {
0,
0,
opti611_init, opti611_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};

2
src/disk/hdc_ide_sff8038i.c
View File

@@ -524,7 +524,7 @@ const device_t sff8038i_device =
sff_init,
sff_close,
sff_reset,
NULL,
{ NULL },
NULL,
NULL,
NULL

2
src/disk/hdc_st506_at.c
View File

@@ -773,5 +773,5 @@ const device_t st506_at_wd1003_device = {
DEVICE_ISA | DEVICE_AT,
0,
mfm_init, mfm_close, NULL,
NULL, NULL, NULL, NULL
{ NULL }, NULL, NULL, NULL
};

36
src/disk/hdc_st506_xt.c
View File

@@ -1617,7 +1617,7 @@ wd1002a_27x_available(void)
static const device_config_t dtc_config[] = {
{
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000,
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 },
{
{
"Disabled", 0x00000
@@ -1646,7 +1646,7 @@ static const device_config_t dtc_config[] = {
static const device_config_t st11_config[] = {
{
"base", "Address", CONFIG_HEX16, "", 0x0320,
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 },
{
{
"320H", 0x0320
@@ -1666,7 +1666,7 @@ static const device_config_t st11_config[] = {
}
},
{
"irq", "IRQ", CONFIG_SELECTION, "", 5,
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 },
{
{
"IRQ 2", 2
@@ -1680,7 +1680,7 @@ static const device_config_t st11_config[] = {
}
},
{
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000,
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 },
{
{
"Disabled", 0x00000
@@ -1703,7 +1703,7 @@ static const device_config_t st11_config[] = {
}
},
{
"revision", "Board Revision", CONFIG_SELECTION, "", 19,
"revision", "Board Revision", CONFIG_SELECTION, "", 19, "", { 0 },
{
{
"Rev. 05 (v1.7)", 5
@@ -1723,7 +1723,7 @@ static const device_config_t st11_config[] = {
static const device_config_t wd_config[] = {
{
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000,
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 },
{
{
"Disabled", 0x00000
@@ -1737,7 +1737,7 @@ static const device_config_t wd_config[] = {
}
},
{
"base", "Address", CONFIG_HEX16, "", 0x0320,
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 },
{
{
"320H", 0x0320
@@ -1751,7 +1751,7 @@ static const device_config_t wd_config[] = {
}
},
{
"irq", "IRQ", CONFIG_SELECTION, "", 5,
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 },
{
{
"IRQ 2", 2
@@ -1771,7 +1771,7 @@ static const device_config_t wd_config[] = {
static const device_config_t wd_rll_config[] = {
{
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000,
"bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 },
{
{
"Disabled", 0x00000
@@ -1785,7 +1785,7 @@ static const device_config_t wd_rll_config[] = {
}
},
{
"base", "Address", CONFIG_HEX16, "", 0x0320,
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 },
{
{
"320H", 0x0320
@@ -1799,7 +1799,7 @@ static const device_config_t wd_rll_config[] = {
}
},
{
"irq", "IRQ", CONFIG_SELECTION, "", 5,
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 },
{
{
"IRQ 2", 2
@@ -1813,7 +1813,7 @@ static const device_config_t wd_rll_config[] = {
}
},
{
"translate", "Translate 26 -> 17", CONFIG_SELECTION, "", 0,
"translate", "Translate 26 -> 17", CONFIG_SELECTION, "", 0, "", { 0 },
{
{
"Off", 0
@@ -1837,7 +1837,7 @@ const device_t st506_xt_xebec_device = {
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 0,
st506_init, st506_close, NULL,
xebec_available,
{ xebec_available },
NULL, NULL,
NULL
};
@@ -1847,7 +1847,7 @@ const device_t st506_xt_dtc5150x_device = {
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 1,
st506_init, st506_close, NULL,
dtc5150x_available,
{ dtc5150x_available },
NULL, NULL,
dtc_config
};
@@ -1857,7 +1857,7 @@ const device_t st506_xt_st11_m_device = {
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 11,
st506_init, st506_close, NULL,
st11_m_available,
{ st11_m_available },
NULL, NULL,
st11_config
};
@@ -1867,7 +1867,7 @@ const device_t st506_xt_st11_r_device = {
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 12,
st506_init, st506_close, NULL,
st11_r_available,
{ st11_r_available },
NULL, NULL,
st11_config
};
@@ -1877,7 +1877,7 @@ const device_t st506_xt_wd1002a_wx1_device = {
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 21,
st506_init, st506_close, NULL,
wd1002a_wx1_available,
{ wd1002a_wx1_available },
NULL, NULL,
wd_config
};
@@ -1887,7 +1887,7 @@ const device_t st506_xt_wd1002a_27x_device = {
DEVICE_ISA,
(HDD_BUS_MFM << 8) | 22,
st506_init, st506_close, NULL,
wd1002a_27x_available,
{ wd1002a_27x_available },
NULL, NULL,
wd_rll_config
};

10
src/disk/hdc_xta.c
View File

@@ -1104,7 +1104,7 @@ xta_close(void *priv)
static const device_config_t wdxt150_config[] = {
{
"base", "Address", CONFIG_HEX16, "", 0x0320, /*W2*/
"base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, /*W2*/
{
{
"320H", 0x0320
@@ -1118,7 +1118,7 @@ static const device_config_t wdxt150_config[] = {
},
},
{
"irq", "IRQ", CONFIG_SELECTION, "", 5, /*W3*/
"irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, /*W3*/
{
{
"IRQ 5", 5
@@ -1132,7 +1132,7 @@ static const device_config_t wdxt150_config[] = {
},
},
{
"bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xc8000, /*W1*/
"bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, /*W1*/
{
{
"C800H", 0xc8000
@@ -1156,7 +1156,7 @@ const device_t xta_wdxt150_device = {
DEVICE_ISA,
0,
xta_init, xta_close, NULL,
xta_available, NULL, NULL,
{ xta_available }, NULL, NULL,
wdxt150_config
};
@@ -1166,6 +1166,6 @@ const device_t xta_hd20_device = {
DEVICE_ISA,
1,
xta_init, xta_close, NULL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};

16
src/disk/hdc_xtide.c
View File

@@ -248,37 +248,37 @@ xtide_at_close(void *priv)
const device_t xtide_device = {
"XTIDE",
"PC/XT XTIDE",
DEVICE_ISA,
0,
xtide_init, xtide_close, NULL,
xtide_available, NULL, NULL,
{ xtide_available }, NULL, NULL,
NULL
};
const device_t xtide_at_device = {
"XTIDE (AT)",
"PC/AT XTIDE",
DEVICE_ISA | DEVICE_AT,
0,
xtide_at_init, xtide_at_close, NULL,
xtide_at_available, NULL, NULL,
{ xtide_at_available }, NULL, NULL,
NULL
};
const device_t xtide_acculogic_device = {
"XTIDE (Acculogic)",
"Acculogic XT IDE",
DEVICE_ISA,
0,
xtide_acculogic_init, xtide_close, NULL,
xtide_acculogic_available, NULL, NULL,
{ xtide_acculogic_available }, NULL, NULL,
NULL
};
const device_t xtide_at_ps2_device = {
"XTIDE (AT) (1.1.5)",
"PS/2 AT XTIDE (1.1.5)",
DEVICE_AT,
0,
xtide_at_ps2_init, xtide_at_close, NULL,
xtide_at_ps2_available, NULL, NULL,
{ xtide_at_ps2_available }, NULL, NULL,
NULL
};