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

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
};