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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2020-10-14 16:33:40 -03:00
parent d876534e63 01362b3dc6
commit 65da6ae46f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/chipset/via_pipc.c
View File

@@ -745,6 +745,7 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
c = (dev->power_regs[0x49] << 8); c = (dev->power_regs[0x49] << 8);
if (dev->local >= VIA_PIPC_596A) if (dev->local >= VIA_PIPC_596A)
c |= (dev->power_regs[0x48] & 0x80); c |= (dev->power_regs[0x48] & 0x80);
acpi_set_timer32(dev->acpi, dev->power_regs[0x41] & 0x08);
acpi_update_io_mapping(dev->acpi, c, dev->power_regs[0x41] & 0x80); acpi_update_io_mapping(dev->acpi, c, dev->power_regs[0x41] & 0x80);
break; break;
@@ -850,8 +851,12 @@ pipc_init(const device_t *info)
pci_enable_mirq(2); pci_enable_mirq(2);
} }
if (dev->acpi) if (dev->acpi) {
acpi_set_slot(dev->acpi, dev->slot);
acpi_set_nvr(dev->acpi, dev->nvr);
acpi_init_gporeg(dev->acpi, 0xff, 0xbf, 0xff, 0x7f); acpi_init_gporeg(dev->acpi, 0xff, 0xbf, 0xff, 0x7f);
}
return dev; return dev;
} }

2
src/printer/prt_ps.c
View File

@@ -309,7 +309,7 @@ ps_write_ctrl(uint8_t val, void *p)
dev->ack = true; dev->ack = true;
timer_set_delay_u64(&dev->pulse_timer, ISACONST); timer_set_delay_u64(&dev->pulse_timer, ISACONST);
timer_set_delay_u64(&dev->timeout_timer, 500000 * TIMER_USEC); timer_set_delay_u64(&dev->timeout_timer, 5000000 * TIMER_USEC);
} }
dev->ctrl = val; dev->ctrl = val;