Changeset 6189 in vbox

Timestamp:

Dec 27, 2007 3:36:00 PM (17 years ago)

Author:

vboxsync

Message:

Bump SSM version and fix compilation

File:

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

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

@@ -64 +64 @@
 #endif /* VBOX_SERIAL_PCI */
 
-#define SERIAL_SAVED_STATE_VERSION  2
+#define SERIAL_SAVED_STATE_VERSION  3
 
 #define UART_LCR_DLAB               0x80        /* Divisor latch access bit */
@@ -378 +378 @@
             ret |= (s->mcr & 0x01) << 5;
         } else {
+#ifndef IN_RING3
+        *pRC = VINF_IOM_HC_IOPORT_READ;
+#else
             ret = s->msr;
             /* Reset delta bits. */
@@ -383 +386 @@
             s->msr_changed = false;
             serial_update_irq(s);
+#endif
         }
         break;
@@ -560 +564 @@
     SSMR3PutS32(pSSMHandle, pData->last_break_enable);
     SSMR3PutU32(pSSMHandle, pData->base);
+    SSMR3PutBool(pSSMHandle, pData->msr_changed);
     return SSMR3PutU32(pSSMHandle, ~0); /* sanity/terminator */
 }
@@ -597 +602 @@
     SSMR3GetS32(pSSMHandle, &pData->last_break_enable);
     SSMR3GetU32(pSSMHandle, &pData->base);
+    SSMR3GetBool(pSSMHandle, &pData->msr_changed);
 
     rc = SSMR3GetU32(pSSMHandle, &u32);