From 68c88b970f09bfd7903f70d04bc42674981a6ee4 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Thu, 8 Sep 2022 20:30:15 -0400 Subject: [PATCH] More changes --- src/acpi.c | 4 +++- src/chipset/intel_815ep.c | 1 - src/device/CMakeLists.txt | 3 ++- src/device/tco.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 13435646c..95b90dc00 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -11,8 +11,10 @@ * * * Authors: Miran Grca, + * Tiseno100 * * Copyright 2020 Miran Grca. + * Copyright 2022 Tiseno100. */ #include #include @@ -919,7 +921,7 @@ acpi_reg_write_intel_ich2(int size, uint16_t addr, uint8_t val, void *p) break; case 0x28: case 0x29: - /* GPE0_STS—General Purpose Event 0 Status Register */ + /* GPE0_STS - General Purpose Event 0 Status Register */ dev->regs.gpsts &= ~((val << shift16) & 0x09fb); break; diff --git a/src/chipset/intel_815ep.c b/src/chipset/intel_815ep.c index 157921477..7c2b06fa0 100644 --- a/src/chipset/intel_815ep.c +++ b/src/chipset/intel_815ep.c @@ -36,7 +36,6 @@ #include <86box/pci.h> #include <86box/smram.h> #include <86box/spd.h> -//#include <86box/video.h> #include <86box/agpgart.h> #include <86box/chipset.h> diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index 358a63fa5..ca4265889 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -14,7 +14,8 @@ # add_library(dev OBJECT bugger.c cassette.c cartridge.c hasp.c hwm.c hwm_lm75.c hwm_lm78.c hwm_gl518sm.c hwm_nsc366.c - hwm_vt82c686.c ibm_5161.c intel_ich2_gpio.c intel_ich2_trap.c isamem.c isartc.c ../lpt.c pci_bridge.c + hwm_vt82c686.c ibm_5161.c intel_ich2_gpio.c intel_ich2_trap.c + isamem.c isartc.c ../lpt.c pci_bridge.c postcard.c serial.c clock_ics9xxx.c isapnp.c i2c.c i2c_gpio.c smbus_piix4.c smbus_ali7101.c keyboard.c keyboard_xt.c keyboard_at.c mouse.c mouse_bus.c mouse_serial.c mouse_ps2.c phoenix_486_jumper.c diff --git a/src/device/tco.c b/src/device/tco.c index 4072c0569..8e82ffbf8 100644 --- a/src/device/tco.c +++ b/src/device/tco.c @@ -85,7 +85,7 @@ tco_write(uint16_t addr, uint8_t val, tco_t *dev) case 0x02: /* TCO Data in */ dev->regs[addr] = val; dev->regs[0x04] |= 2; - smi_line = 1; + smi_raise(); break; case 0x03: /* TCO Data out */ @@ -140,7 +140,7 @@ tco_read(uint16_t addr, tco_t *dev) tco_log("TCO: Read 0x%02x from Register 0x%02x\n", dev->regs[addr], addr); return dev->regs[addr]; } else - return 0; + return 0xff; } static void