From d68121ae898ae0d9d168d250efc5f77f04248242 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 16 Jul 2022 02:54:49 +0200 Subject: [PATCH] ACPI, APM, PIC, and USB. --- src/acpi.c | 8 ++++---- src/apm.c | 2 +- src/pic.c | 2 +- src/usb.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index c73440fa5..470e24c41 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -144,12 +144,12 @@ acpi_raise_smi(void *priv, int do_smi) if ((dev->vendor == VEN_VIA) || (dev->vendor == VEN_VIA_596B)) { if ((!dev->regs.smi_lock || !dev->regs.smi_active)) { if (do_smi) - smi_line = 1; + smi_raise(); dev->regs.smi_active = 1; } } else if ((dev->vendor == VEN_INTEL) || (dev->vendor == VEN_ALI)) { if (do_smi) - smi_line = 1; + smi_raise(); /* Clear bit 16 of GLBCTL. */ if (dev->vendor == VEN_INTEL) dev->regs.glbctl &= ~0x00010000; @@ -157,7 +157,7 @@ acpi_raise_smi(void *priv, int do_smi) dev->regs.ali_soft_smi = 1; } else if (dev->vendor == VEN_SMC) { if (do_smi) - smi_line = 1; + smi_raise(); } } } @@ -1449,7 +1449,7 @@ acpi_apm_out(uint16_t port, uint8_t val, void *p) dev->apm->cmd = val; // acpi_raise_smi(dev, dev->apm->do_smi); if (dev->apm->do_smi) - smi_line = 1; + smi_raise(); dev->regs.ali_soft_smi = 1; } else if (port == 0x0003) dev->apm->stat = val; diff --git a/src/apm.c b/src/apm.c index 9bee70e78..3fe8d54c6 100644 --- a/src/apm.c +++ b/src/apm.c @@ -67,7 +67,7 @@ apm_out(uint16_t port, uint8_t val, void *p) if (port == 0x0000) { dev->cmd = val; if (dev->do_smi) - smi_line = 1; + smi_raise(); } else dev->stat = val; } diff --git a/src/pic.c b/src/pic.c index efe81f470..23f99945e 100644 --- a/src/pic.c +++ b/src/pic.c @@ -608,7 +608,7 @@ picint_common(uint16_t num, int level, int set) if (set) { if (smi_irq_mask & num) { - smi_line = 1; + smi_raise(); smi_irq_status |= num; } diff --git a/src/usb.c b/src/usb.c index 2f8f957b5..c70fc2d63 100644 --- a/src/usb.c +++ b/src/usb.c @@ -173,7 +173,7 @@ ohci_mmio_write(uint32_t addr, uint8_t val, void *p) if (val & 0x08) { dev->ohci_mmio[0x0f] = 0x40; if ((dev->ohci_mmio[0x13] & 0xc0) == 0xc0) - smi_line = 1; + smi_raise(); } /* bit HostControllerReset must be cleared for the controller to be seen as initialized */