Changeset 49469 in vbox for trunk

Timestamp:

Nov 13, 2013 2:11:16 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90600

Message:

DevPS2: Release keys after restoring saved state, not while loading it.

Location:

trunk/src/VBox/Devices/Input

Files:

trunk/src/VBox/Devices/Input/DevPS2.cpp

-              r48214
+              r49469
 /**
+ * @callback_method_impl{FNSSMDEVLOADDONE, Key state fix-up after loading
+ */
+static DECLCALLBACK(int) kbdLoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+    KBDState    *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+    int rc;
+    rc = PS2KLoadDone(&pThis->Kbd, pSSM);
+    return rc;
+}
+/**
  * Reset notification.
+ *
 …
             return rc;
+    }
+    rc = PDMDevHlpSSMRegister(pDevIns, PCKBD_SAVED_STATE_VERSION, sizeof(*pThis), kbdSaveExec, kbdLoadExec);
+    rc = PDMDevHlpSSMRegisterEx(pDevIns, PCKBD_SAVED_STATE_VERSION, sizeof(*pThis), NULL,
+                                NULL, NULL, NULL,
+                                NULL, kbdSaveExec, NULL,
+                                NULL, kbdLoadExec, kbdLoadDone);
     if (RT_FAILURE(rc))
         return rc;

r48214	r49469
51	51	void PS2KSaveState(PPS2K pThis, PSSMHANDLE pSSM);
52	52	int PS2KLoadState(PPS2K pThis, PSSMHANDLE pSSM, uint32_t uVersion);
	53	int PS2KLoadDone(PPS2K pThis, PSSMHANDLE pSSM);
53	54
54	55	PS2K *KBDGetPS2KFromDevIns(PPDMDEVINS pDevIns);

-              r49384
+              r49469
             pThis->abDepressedKeys[u8] = 1;
+        }
-        ps2kReleaseKeys(pThis);
+    }
 …
     return rc;
+}
+int PS2KLoadDone(PPS2K pThis, PSSMHANDLE pSSM)
+{
+    /* This *must* be done after the inital load because it may trigger
+     * interrupts and change the interrupt controller state.
+     */
+    ps2kReleaseKeys(pThis);
+    return VINF_SUCCESS;
+}

Note: See TracChangeset for help on using the changeset viewer.