Changeset 29889 in vbox for trunk

Timestamp:

May 31, 2010 10:06:26 AM (15 years ago)

Author:

vboxsync

Message:

Devices/Serial: SSM state adaption for 16550A emulation

File:

• trunk/src/VBox/Devices/Serial/DevSerial.cpp (modified) (10 diffs)

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

@@ -67 +67 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define SERIAL_SAVED_STATE_VERSION  3
+#define SERIAL_SAVED_STATE_VERSION_16450        3
+#define SERIAL_SAVED_STATE_VERSION              4
 
 #define UART_LCR_DLAB       0x80        /* Divisor latch access bit */
@@ -216 +217 @@
     bool                            fYieldOnLSRRead;
     bool volatile                   fRecvWaiting;
+    bool                            f16550AEnabled;
     bool                            Alignment3[3];
     /** Time it takes to transmit a character */
@@ -459 +461 @@
         break;
     case 2:
+        if (!s->f16550AEnabled)
+            break;
+
         val = val & 0xFF;
 
@@ -941 +946 @@
     SSMR3PutU8(pSSM, pThis->msr);
     SSMR3PutU8(pSSM, pThis->scr);
+    SSMR3PutU8(pSSM, pThis->fcr); /* 16550A */
     SSMR3PutS32(pSSM, pThis->thr_ipending);
     SSMR3PutS32(pSSM, pThis->irq);
@@ -946 +952 @@
     SSMR3PutU32(pSSM, pThis->base);
     SSMR3PutBool(pSSM, pThis->msr_changed);
+
+    /* Don't store:
+     *  - the content of the FIFO
+     *  - tsr_retry
+     */
+
     return SSMR3PutU32(pSSM, ~0); /* sanity/terminator */
 }
@@ -959 +971 @@
     SerialState *pThis = PDMINS_2_DATA(pDevIns, SerialState *);
 
-    AssertMsgReturn(uVersion == SERIAL_SAVED_STATE_VERSION, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
+    if (uVersion == SERIAL_SAVED_STATE_VERSION_16450)
+    {
+        pThis->f16550AEnabled = false;
+    }
+    else
+        AssertMsgReturn(uVersion == SERIAL_SAVED_STATE_VERSION, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
 
     if (uPass == SSM_PASS_FINAL)
@@ -971 +988 @@
         SSMR3GetU8(pSSM, &pThis->msr);
         SSMR3GetU8(pSSM, &pThis->scr);
+        if (uVersion > SERIAL_SAVED_STATE_VERSION_16450)
+        {
+            SSMR3GetU8(pSSM, &pThis->fcr);
+        }
         SSMR3GetS32(pSSM, &pThis->thr_ipending);
     }
@@ -1000 +1021 @@
         AssertMsgReturn(u32 == ~0U, ("%#x\n", u32), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
 
-        if (pThis->lsr & UART_LSR_DR)
+        if (   (pThis->lsr & UART_LSR_DR)
+            || pThis->fRecvWaiting)
         {
+            pThis->fRecvWaiting = false;
             rc = RTSemEventSignal(pThis->ReceiveSem);
             AssertRC(rc);
@@ -1192 +1215 @@
 #endif
 
+    pThis->f16550AEnabled = true;
+
     /*
      * Initialize critical section and the semaphore.
@@ -1246 +1271 @@
             return rc;
     }
-
 
     if (pThis->fR0Enabled)