Revert "Revert "Merge branch 'feature/machine_and_kb' into master""

This reverts commit f2cd3756dd.
2021-07-04 17:40:39 +02:00
parent 3b61d8a4d1
commit 4f6df76f10
77 changed files with 11883 additions and 3484 deletions
--- a/src/usb.c
+++ b/src/usb.c
@@ -146,6 +146,9 @@ ohci_mmio_read(uint32_t addr, void *p)

    ret = dev->ohci_mmio[addr];

+    if (addr == 0x101)
+	ret = (ret & 0xfe) | (!!mem_a20_key);
+
    return ret;
 }