Merge remote-tracking branch 'origin/master' into novell_keycard

2024-02-29 14:04:11 +06:00
parent 96e34f9b81 0c345fd9e8
commit 8bb4778cf3
7 changed files with 72 additions and 4 deletions
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -686,7 +686,10 @@ serial_read(uint16_t addr, void *priv)
            serial_update_ints(dev);
            break;
        case 6:
-            ret = dev->msr | dev->msr_set;
+            if (dev->mctrl & 0x10)
+                ret = dev->msr;
+            else
+                ret = dev->msr | dev->msr_set;
            dev->msr &= ~0x0f;
            dev->int_status &= ~SERIAL_INT_MSR;
            serial_update_ints(dev);