claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1598 from 86Box/master

Browse Source 
Bring the branch up to par with master.
This commit is contained in:
Miran Grča
2021-08-10 15:49:15 +02:00
committed by GitHub
parent 5c8d06ab35 03d91af98c
commit 9d648644f8
6 changed files with 108 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chipset/stpc.c
View File

@@ -150,7 +150,7 @@ stpc_recalcmapping(stpc_t *dev)
}
}
flushmmucache();
flushmmucache_nopc();
}

5
src/chipset/via_pipc.c
View File

@@ -1122,9 +1122,8 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
break;
case 0x42:
dev->power_regs[addr] &= ~0x2f;
dev->power_regs[addr] |= val & 0x2f;
acpi_set_irq_line(dev->acpi, dev->power_regs[addr]);
dev->power_regs[addr] = (dev->power_regs[addr] & 0xf0) | (val & 0x0f);
acpi_set_irq_line(dev->acpi, dev->power_regs[addr] & 0x0f);
break;
case 0x54: