80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Corrected PIIX4 ACPI GPIREG defaults to fix the ASUS P2B-LS.

Browse Source
This commit is contained in:
OBattler
2021-04-27 04:39:46 +02:00
parent e99f40689b
commit 49b1753dd0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/chipset/intel_piix.c
View File

@@ -230,7 +230,7 @@ kbc_alias_update_io_mapping(piix_t *dev)
static void static void
smbus_update_io_mapping(piix_t *dev) smbus_update_io_mapping(piix_t *dev)
{ {
smbus_piix4_remap(dev->smbus, (dev->regs[3][0x91] << 8) | (dev->regs[3][0x90] & 0xf0), (dev->regs[3][PCI_REG_COMMAND] & PCI_COMMAND_IO) && (dev->regs[3][0xd2] & 0x01)); smbus_piix4_remap(dev->smbus, ((uint16_t) (dev->regs[3][0x91] << 8)) | (dev->regs[3][0x90] & 0xf0), (dev->regs[3][PCI_REG_COMMAND] & PCI_COMMAND_IO) && (dev->regs[3][0xd2] & 0x01));
} }
@@ -890,6 +890,8 @@ piix_read(int func, int addr, void *priv)
ret = fregs[addr]; ret = fregs[addr];
if ((func == 0) && (addr == 0x4e)) if ((func == 0) && (addr == 0x4e))
ret |= keyboard_at_get_mouse_scan(); ret |= keyboard_at_get_mouse_scan();
else if ((func == 2) && (addr == 0xff))
ret |= 0xef;
piix_log("PIIX function %i read: %02X from %02X\n", func, ret, addr); piix_log("PIIX function %i read: %02X from %02X\n", func, ret, addr);
} }
@@ -919,7 +921,8 @@ board_read(uint16_t port, void *priv)
uint8_t ret = 0x64; uint8_t ret = 0x64;
if (port == 0x0078) if (port == 0x0078)
ret = dev->board_config[0]; ret = 0x00;
// ret = dev->board_config[0];
else if (port == 0x0079) else if (port == 0x0079)
ret = dev->board_config[1]; ret = dev->board_config[1];
else if (port == 0x00e0) else if (port == 0x00e0)
@@ -1278,7 +1281,7 @@ static void
dev->acpi = device_add(&acpi_intel_device); dev->acpi = device_add(&acpi_intel_device);
acpi_set_slot(dev->acpi, dev->pci_slot); acpi_set_slot(dev->acpi, dev->pci_slot);
acpi_set_nvr(dev->acpi, dev->nvr); acpi_set_nvr(dev->acpi, dev->nvr);
acpi_set_gpireg2_default(dev->acpi, (dev->type > 4) ? 0xf1 : 0xfd); acpi_set_gpireg2_default(dev->acpi, (dev->type > 4) ? 0xf1 : 0xdd);
dev->ddma = device_add(&ddma_device); dev->ddma = device_add(&ddma_device);
} else } else