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

Make the USB function disable bits cleaner

Browse Source
This commit is contained in:
RichardG867
2020-10-11 12:09:56 -03:00
parent cfedd05072
commit e989c01639
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chipset/via_pipc.c
View File

@@ -409,8 +409,7 @@ pipc_read(int func, int addr, void *priv)
}
else if ((func == 1) && !(dev->pci_isa_regs[0x48] & 0x02)) /* IDE */
ret = dev->ide_regs[addr];
else if ((func < pm_func) && (((func == 2) && !(dev->pci_isa_regs[0x48] & 0x04)) ||
((func == 3) && !(dev->pci_isa_regs[0x85] & 0x10)))) /* USB */
else if ((func < pm_func) && !((func == 2) ? (dev->pci_isa_regs[0x48] & 0x04) : (dev->pci_isa_regs[0x85] & 0x10))) /* USB */
ret = dev->usb_regs[func - 2][addr];
else if (func == pm_func) /* Power */
ret = dev->power_regs[addr];
@@ -660,10 +659,7 @@ pipc_write(int func, int addr, uint8_t val, void *priv)
return;
/* Check disable bits for both controllers */
if ((func == 2) && (dev->pci_isa_regs[0x48] & 0x04))
return;
if ((func == 3) && (dev->pci_isa_regs[0x85] & 0x10))
if ((func == 2) ? (dev->pci_isa_regs[0x48] & 0x04) : (dev->pci_isa_regs[0x85] & 0x10))
return;
switch (addr) {