Changeset 6188 in vbox

Timestamp:

Dec 27, 2007 3:29:12 PM (17 years ago)

Author:

vboxsync

Message:

Set interrupt if states changed

Location:

trunk/src/VBox/Devices/Serial

Files:

• DevSerial.cpp (modified) (8 diffs)
• DrvHostSerial.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -146 +146 @@
     int                             thr_ipending;
     int                             irq;
+    bool                            msr_changed;
 
     bool                            fGCEnabled;
@@ -182 +183 @@
     } else if (s->thr_ipending && (s->ier & UART_IER_THRI)) {
         s->iir = UART_IIR_THRI;
+    } else if (s->msr_changed && (s->ier & UART_IER_RLSI)) {
+        s->iir = UART_IIR_RLSI;
     } else {
         s->iir = UART_IIR_NO_INT;
@@ -281 +284 @@
         {
             int break_enable;
-            s->lcr = val;
-            serial_update_parameters(s);
+            if (s->lcr != val)
+            {
+                s->lcr = val;
+                serial_update_parameters(s);
+            }
             break_enable = (val >> 6) & 1;
             if (break_enable != s->last_break_enable) {
@@ -375 +381 @@
             /* Reset delta bits. */
             s->msr &= ~UART_MSR_ANY_DELTA;
+            s->msr_changed = false;
+            serial_update_irq(s);
         }
         break;
@@ -425 +433 @@
     SerialState *pData = PDMICHARPORT_2_SERIALSTATE(pInterface);
     uint8_t newMsr = 0;
+
+    Log(("%s: pInterface=%p newStatusLines=%u\n", __FUNCTION__, pInterface, newStatusLines));
 
     PDMCritSectEnter(&pData->CritSect, VERR_PERMISSION_DENIED);
@@ -449 +459 @@
 
     pData->msr = newMsr;
+    pData->msr_changed = true;
     serial_update_irq(pData);
 
@@ -713 +724 @@
      */
     if (!CFGMR3AreValuesValid(pCfgHandle, "IRQ\0IOBase\0"))
+    {
+        AssertMsgFailed(("serialConstruct Invalid configuration values\n"));
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
+    }
 
     rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &pData->fGCEnabled);
@@ -749 +763 @@
         return rc;
 
-/** @todo r=bird: Check for VERR_CFGM_VALUE_NOT_FOUND and provide sensible defaults.
- * Also do AssertMsgFailed(("Configuration error:....)) in the failure cases of CFGMR3Query*()
- * and CFGR3AreValuesValid() like we're doing in the other devices.  */
     rc = CFGMR3QueryU8 (pCfgHandle, "IRQ", &irq_lvl);
-    if (VBOX_FAILURE (rc))
-        return rc;
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+    {
+        /* Provide sensible defaults. */
+        if (iInstance == 0)
+            irq_lvl = 4;
+        else if (iInstance == 1)
+            irq_lvl = 3;
+    }
+    else if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to get the \"IRQ\" value"));
 
     rc = CFGMR3QueryU16 (pCfgHandle, "IOBase", &io_base);
-    if (VBOX_FAILURE (rc))
-        return rc;
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+    {
+        if (iInstance == 0)
+            io_base = 0x3f8;
+        else if (iInstance == 1)
+            io_base = 0x2f8;
+    }
+    else if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to get the \"IOBase\" value"));
 
     Log(("serialConstruct instance %d iobase=%04x irq=%d\n", iInstance, io_base, irq_lvl));

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -620 +620 @@
                 /* The status lines have changed. Notify the device. */
                 DWORD dwNewStatusLinesState = 0;
-                uint8_t uNewStatusLinesState = 0;
+                uint32_t uNewStatusLinesState = 0;
 
                 /* Get the new state */