Changeset 72407 in vbox for trunk/src/VBox

Timestamp:

Jun 1, 2018 9:56:21 AM (7 years ago)

Author:

vboxsync

Message:

PS2K: Renamed variable to avoid partial duplicate.

Location:

trunk/src/VBox/Devices

Files:

• Input/PS2K.cpp (modified) (6 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -172 +172 @@
     uint8_t             u8LEDs;
     /** Selected typematic delay/rate. */
-    uint8_t             u8Typematic;
+    uint8_t             u8TypematicCfg;
     /** Usage code of current typematic key, if any. */
     uint8_t             u8TypematicKey;
@@ -666 +666 @@
     unsigned    period;
 
-    pThis->u8Typematic = val;
+    pThis->u8TypematicCfg = val;
     /* The delay is easy: (1 + value) * 250 ms */
     pThis->uTypematicDelay = (1 + ((val >> 5) & 3)) * 250;
@@ -1192 +1192 @@
                     pThis->keyQ.cUsed, pThis->keyQ.cSize);
     if (pThis->enmTypematicState != KBD_TMS_IDLE)
-        pHlp->pfnPrintf(pHlp, "Active typematic key %02X (%s)\n", pThis->u8Typematic,
+        pHlp->pfnPrintf(pHlp, "Active typematic key %02X (%s)\n", pThis->u8TypematicKey,
                         pThis->enmTypematicState == KBD_TMS_DELAY ? "delay" : "repeat");
 }
@@ -1348 +1348 @@
     SSMR3PutU8(pSSM, pThis->u8CurrCmd);
     SSMR3PutU8(pSSM, pThis->u8LEDs);
-    SSMR3PutU8(pSSM, pThis->u8Typematic);
+    SSMR3PutU8(pSSM, pThis->u8TypematicCfg);
     SSMR3PutU8(pSSM, pThis->u8TypematicKey);
     SSMR3PutU8(pSSM, pThis->u8Modifiers);
@@ -1396 +1396 @@
     SSMR3GetU8(pSSM, &pThis->u8CurrCmd);
     SSMR3GetU8(pSSM, &pThis->u8LEDs);
-    SSMR3GetU8(pSSM, &pThis->u8Typematic);
+    SSMR3GetU8(pSSM, &pThis->u8TypematicCfg);
     SSMR3GetU8(pSSM, &pThis->u8TypematicKey);
     SSMR3GetU8(pSSM, &pThis->u8Modifiers);
@@ -1416 +1416 @@
 
     /* Recalculate the typematic delay/rate. */
-    ps2kSetupTypematic(pThis, pThis->u8Typematic);
+    ps2kSetupTypematic(pThis, pThis->u8TypematicCfg);
 
     /* Fake key up events for keys that were held down at the time the state was saved. */

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -479 +479 @@
     GEN_CHECK_OFF(PS2K, fNumLockOn);
     GEN_CHECK_OFF(PS2K, u8ScanSet);
-    GEN_CHECK_OFF(PS2K, u8Typematic);
+    GEN_CHECK_OFF(PS2K, u8TypematicCfg);
     GEN_CHECK_OFF(PS2K, enmTypematicState);
     GEN_CHECK_OFF(PS2K, keyQ);