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

Fixes to ACPI and 4x0 - fixes the Freeway.

Browse Source
This commit is contained in:
OBattler
2020-11-17 22:17:51 +01:00
parent 848a2183c2
commit d2ad8fce43
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/acpi.c
View File

@@ -81,25 +81,6 @@ acpi_update_irq(void *priv)
} }
static void
acpi_raise_smi_common(void *priv)
{
acpi_t *dev = (acpi_t *) priv;
if ((dev->vendor == VEN_VIA) || (dev->vendor == VEN_VIA_596B)) {
if ((!dev->regs.smi_lock || !dev->regs.smi_active)) {
smi_line = 1;
dev->regs.smi_active = 1;
}
} else if (dev->vendor == VEN_INTEL) {
smi_line = 1;
/* Clear bit 16 of GLBCTL. */
dev->regs.glbctl &= ~0x00010000;
} else if (dev->vendor == VEN_SMC)
smi_line = 1;
}
static void static void
acpi_raise_smi(void *priv) acpi_raise_smi(void *priv)
{ {
@@ -108,8 +89,19 @@ acpi_raise_smi(void *priv)
if ((dev->vendor == VEN_INTEL) && !(dev->regs.glbctl & 0x00010000)) if ((dev->vendor == VEN_INTEL) && !(dev->regs.glbctl & 0x00010000))
return; return;
if (dev->regs.glbctl & 0x01) if (dev->regs.glbctl & 0x01) {
acpi_raise_smi_common(dev); if ((dev->vendor == VEN_VIA) || (dev->vendor == VEN_VIA_596B)) {
if ((!dev->regs.smi_lock || !dev->regs.smi_active)) {
smi_line = 1;
dev->regs.smi_active = 1;
}
} else if (dev->vendor == VEN_INTEL) {
smi_line = 1;
/* Clear bit 16 of GLBCTL. */
dev->regs.glbctl &= ~0x00010000;
} else if (dev->vendor == VEN_SMC)
smi_line = 1;
}
} }
@@ -1119,7 +1111,7 @@ acpi_apm_out(uint16_t port, uint8_t val, void *p)
if (dev->apm->do_smi) { if (dev->apm->do_smi) {
if (dev->vendor == VEN_INTEL) if (dev->vendor == VEN_INTEL)
dev->regs.glbsts |= 0x20; dev->regs.glbsts |= 0x20;
acpi_raise_smi_common(dev); acpi_raise_smi(dev);
} }
} else } else
dev->apm->stat = val; dev->apm->stat = val;

2
src/chipset/intel_4x0.c
View File

@@ -143,7 +143,7 @@ i4x0_smram_handler_phase1(i4x0_t *dev)
size[0] = 0x00020000; size[0] = 0x00020000;
} }
if (((regs[0x72] & 0x78) == 0x48) || ((regs[0x72] & 0x28) == 0x08)) if (regs[0x72] & 0x08)
smram_enable(dev->smram_low, base[0], base[0] & 0x000f0000, size[0], smram_enable(dev->smram_low, base[0], base[0] & 0x000f0000, size[0],
((regs[0x72] & 0x78) == 0x48), (regs[0x72] & 0x08)); ((regs[0x72] & 0x78) == 0x48), (regs[0x72] & 0x08));