Changeset 82204 in vbox

Timestamp:

Nov 25, 2019 9:55:12 PM (5 years ago)

Author:

vboxsync

Message:

DevPS2: type name cleanup. bugref:9218

Location:

trunk/src/VBox/Devices

Files:

• Input/DevPS2.cpp (modified) (5 diffs)
• Input/DevPS2.h (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -208 +208 @@
 
 /** update irq and KBD_STAT_[MOUSE_]OBF */
-static void kbd_update_irq(PPDMDEVINS pDevIns, KBDState *s)
+static void kbd_update_irq(PPDMDEVINS pDevIns, PKBDSTATE s)
 {
     int irq12_level, irq1_level;
@@ -444 +444 @@
 PS2K *KBDGetPS2KFromDevIns(PPDMDEVINS pDevIns)
 {
-    KBDState *pThis = PDMDEVINS_2_DATA(pDevIns, PKBDSTATE);
+    PKBDSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PKBDSTATE);
     return &pThis->Kbd;
 }
@@ -450 +450 @@
 PS2M *KBDGetPS2MFromDevIns(PPDMDEVINS pDevIns)
 {
-    KBDState *pThis = PDMDEVINS_2_DATA(pDevIns, PKBDSTATE);
+    PKBDSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PKBDSTATE);
     return &pThis->Aux;
 }
@@ -515 +515 @@
 #ifdef IN_RING3
 
-static int kbd_load(PCPDMDEVHLPR3 pHlp, PSSMHANDLE pSSM, KBDState *s, uint32_t version_id)
+static int kbd_load(PCPDMDEVHLPR3 pHlp, PSSMHANDLE pSSM, PKBDSTATE s, uint32_t version_id)
 {
     uint32_t    u32, i;
@@ -1093 +1093 @@
     /* .cMaxInstances = */          1,
     /* .uSharedVersion = */         42,
-    /* .cbInstanceShared = */       sizeof(KBDState),
+    /* .cbInstanceShared = */       sizeof(KBDSTATE),
     /* .cbInstanceCC = */           0,
     /* .cbInstanceRC = */           0,

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

@@ -344 +344 @@
     /** Mouse state (implemented in separate PS2M module). */
     PS2M                        Aux;
-} KBDSTATE, KBDState;
+} KBDSTATE;
 
 

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

@@ -448 +448 @@
 
     /* Input/pckbd.c */
-    GEN_CHECK_SIZE(KBDState);
-    GEN_CHECK_OFF(KBDState, write_cmd);
-    GEN_CHECK_OFF(KBDState, status);
-    GEN_CHECK_OFF(KBDState, mode);
-    GEN_CHECK_OFF(KBDState, pDevInsR3);
-    GEN_CHECK_OFF(KBDState, pDevInsR0);
-    GEN_CHECK_OFF(KBDState, pDevInsRC);
+    GEN_CHECK_SIZE(KBDSTATE);
+    GEN_CHECK_OFF(KBDSTATE, write_cmd);
+    GEN_CHECK_OFF(KBDSTATE, status);
+    GEN_CHECK_OFF(KBDSTATE, mode);
+    GEN_CHECK_OFF(KBDSTATE, pDevInsR3);
+    GEN_CHECK_OFF(KBDSTATE, pDevInsR0);
+    GEN_CHECK_OFF(KBDSTATE, pDevInsRC);
     GEN_CHECK_SIZE(KbdKeyQ);
     GEN_CHECK_OFF(KbdCmdQ, rpos);