Changeset 61 in vbox for trunk/src/VBox/Devices/Serial

Timestamp:

Jan 16, 2007 1:15:27 PM (18 years ago)

Author:

vboxsync

Message:

Sync with qemu -- fixed sizeof(divider).

File:

• trunk/src/VBox/Devices/Serial/serial.c (modified) (7 diffs)

trunk/src/VBox/Devices/Serial/serial.c

@@ -119 +119 @@
 
 struct SerialState {
-    uint8_t divider;
+    uint16_t divider;
     uint8_t rbr; /* receive register */
     uint8_t ier;
@@ -378 +378 @@
     SerialState *s = opaque;
 
-    qemu_put_8s(f,&s->divider);
+    qemu_put_be16s(f,&s->divider);
     qemu_put_8s(f,&s->rbr);
     qemu_put_8s(f,&s->ier);
@@ -393 +393 @@
     SerialState *s = opaque;
 
-    if(version_id != 1)
+    if(version_id > 2)
         return -EINVAL;
 
-    qemu_get_8s(f,&s->divider);
+    if (version_id >= 2)
+        qemu_get_be16s(f, &s->divider);
+    else
+        s->divider = qemu_get_byte(f);
     qemu_get_8s(f,&s->rbr);
     qemu_get_8s(f,&s->ier);
@@ -425 +428 @@
     s->msr = UART_MSR_DCD | UART_MSR_DSR | UART_MSR_CTS;
 
-    register_savevm("serial", base, 1, serial_save, serial_load, s);
+    register_savevm("serial", base, 2, serial_save, serial_load, s);
 
     register_ioport_write(base, 8, 1, serial_ioport_write, s);
@@ -512 +515 @@
     s->it_shift = it_shift;
 
-    register_savevm("serial", base, 1, serial_save, serial_load, s);
+    register_savevm("serial", base, 2, serial_save, serial_load, s);
 
     s_io_memory = cpu_register_io_memory(0, serial_mm_read,
@@ -570 +573 @@
     SerialState *s = PDMINS2DATA (pDevIns, SerialState *);
 
-    if (u32Version != 1) {
+    if (u32Version != 2) {
         AssertMsgFailed(("u32Version=%d\n", u32Version));
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
@@ -663 +666 @@
         pDevIns->pDevReg->szDeviceName, /* pszName */
         iInstance,              /* u32Instance */
-        1                       /* u32Version */,
+        2                       /* u32Version */,
         sizeof (*s),            /* cbGuess */
         NULL,                   /* pfnSavePrep */