mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 02:18:20 -07:00
Code Issues Packages Projects Releases Activity

Updates

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-08-10 14:53:09 -04:00
parent fafb1e6f03
commit f1ce911d55
3 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/acpi.c
View File

@@ -95,8 +95,20 @@ static void
acpi_timer_overflow(void *priv)
{
acpi_t *dev = (acpi_t *) priv;
int sci_en = dev->regs.pmcntrl & 1;
dev->regs.pmsts |= TMROF_STS;
acpi_update_irq(dev);
if(dev->regs.pmen & 1) /* Timer Overflow Interrupt Enable */
{
acpi_log("ACPI: Overflow detected. Provoking an %s\n", sci_en ? "SCI" : "SMI");
if(sci_en) /* Trigger an SCI or SMI depending on the status of the SCI_EN register */
acpi_update_irq(dev);
else
acpi_raise_smi(dev, 1);
}
}
static void
@@ -1653,6 +1665,7 @@ acpi_apm_out(uint16_t port, uint8_t val, void *p)
acpi_raise_smi(dev, dev->apm->do_smi);
} else
dev->apm->stat = val;
}
}

1
src/include/86box/chipset.h
View File

@@ -14,7 +14,6 @@
*
* Copyright 2019,2020 Miran Grca.
*/
#ifndef EMU_CHIPSET_H
# define EMU_CHIPSET_H

86
src/machine/machine_table.c
View File

@@ -11727,24 +11727,26 @@ const machine_t machines[] = {
.pad2 = 0,
.cpu = {
.package = CPU_PKG_SOCKET370,
.block= CPU_BLOCK(CPU_CYRIX3S),
.block = CPU_BLOCK(CPU_CYRIX3S),
.min_bus = 66666667,
.max_bus = 133333333,
.min_voltage = 1300,
.max_voltage = 3500,
.min_multi = 1.5,
.max_multi = 8.0,
.max_multi = 8.0
},
.bus_flags = MACHINE_PS2_NOISA,
.flags = MACHINE_IDE_DUAL,
.ram = {
.min = 32768,
.max = 524288,
.step = 32768,
.step = 32768
},
.nvrmask = 255,
.device = NULL,
.vid_device = NULL
.vid_device = NULL,
.snd_device = NULL,
.net_device = NULL
},
{
.name = "[Intel i815EP] Biostar M6TSS",
@@ -11764,41 +11766,7 @@ const machine_t machines[] = {
.min_voltage = 1300,
.max_voltage = 3500,
.min_multi = 1.5,
.max_multi = 8.0,
},
.bus_flags = MACHINE_PS2_AGP,
.flags = MACHINE_IDE_DUAL,
.ram = {
.min = 32768,
.max = 524288,
.step = 32768,
},
.nvrmask = 255,
.kbc = KBC_UNKNOWN,
.kbc_p1 = 0,
.gpio = 0,
.device = NULL,
.vid_device = NULL
},
{
.name = "[Intel i815EP] Tyan Tomcat i815T",
.internal_name = "s2080",
.type = MACHINE_TYPE_ICH2,
.chipset = MACHINE_CHIPSET_INTEL_I815EP,
.init = machine_at_s2080_init,
.pad = 0,
.pad0 = 0,
.pad1 = MACHINE_AVAILABLE,
.pad2 = 0,
.cpu = {
.package = CPU_PKG_SOCKET370,
.block = CPU_BLOCK_NONE,
.min_bus = 66666667,
.max_bus = 133333333,
.min_voltage = 1300,
.max_voltage = 3500,
.min_multi = 1.5,
.max_multi = 8.0,
.max_multi = 8.0
},
.bus_flags = MACHINE_PS2_AGP,
.flags = MACHINE_IDE_DUAL,
@@ -11812,7 +11780,45 @@ const machine_t machines[] = {
.kbc_p1 = 0,
.gpio = 0,
.device = NULL,
.vid_device = NULL
.vid_device = NULL,
.snd_device = NULL,
.net_device = NULL
},
{
.name = "[Intel i815EP] Tyan Tomcat i815T",
.internal_name = "s2080",
.type = MACHINE_TYPE_ICH2,
.chipset = MACHINE_CHIPSET_INTEL_I815EP,
.init = machine_at_s2080_init,
.pad = 0,
.pad0 = 0,
.pad1 = MACHINE_AVAILABLE,
.pad2 = 0,
.cpu = {
.package = CPU_PKG_SOCKET370,
.block = CPU_BLOCK_NONE,
.min_bus = 66666667,
.max_bus = 133333333,
.min_voltage = 1300,
.max_voltage = 3500,
.min_multi = 1.5,
.max_multi = 8.0
},
.bus_flags = MACHINE_PS2_AGP,
.flags = MACHINE_IDE_DUAL,
.ram = {
.min = 32768,
.max = 524288,
.step = 32768
},
.nvrmask = 255,
.kbc = KBC_UNKNOWN,
.kbc_p1 = 0,
.gpio = 0,
.device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.net_device = NULL
},
{