Changeset 25985 in vbox for trunk/src/VBox/Devices/Input/DevPS2.cpp

Timestamp:

Jan 23, 2010 12:51:04 AM (15 years ago)

Author:

vboxsync

Message:

pdmifs.h: the final batch of refactored interface ID code.

File:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (modified) (10 diffs)

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

@@ -229 +229 @@
     {
         /** The base interface for the keyboard port. */
-        PDMIBASE                            Base;
+        PDMIBASE                            IBase;
         /** The keyboard port base interface. */
-        PDMIKEYBOARDPORT                    Port;
+        PDMIKEYBOARDPORT                    IPort;
 
         /** The base interface of the attached keyboard driver. */
@@ -248 +248 @@
     {
         /** The base interface for the mouse port. */
-        PDMIBASE                            Base;
+        PDMIBASE                            IBase;
         /** The mouse port base interface. */
-        PDMIMOUSEPORT                       Port;
+        PDMIMOUSEPORT                       IPort;
 
         /** The base interface of the attached mouse driver. */
@@ -1360 +1360 @@
 static DECLCALLBACK(void *)  kbdKeyboardQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
-    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Keyboard.Base);
-    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
-        return &pThis->Keyboard.Base;
-    if (RTUuidCompare2Strs(pszIID, PDMIKEYBOARDPORT_IID) == 0)
-        return &pThis->Keyboard.Port;
+    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Keyboard.IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->Keyboard.IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIKEYBOARDPORT, &pThis->Keyboard.IPort);
     return NULL;
 }
@@ -1375 +1373 @@
  *
  * @returns VBox status code.
- * @param   pInterface      Pointer to the keyboard port interface (KBDState::Keyboard.Port).
+ * @param   pInterface      Pointer to the keyboard port interface (KBDState::Keyboard.IPort).
  * @param   u8KeyCode       The keycode.
  */
 static DECLCALLBACK(int) kbdKeyboardPutEvent(PPDMIKEYBOARDPORT pInterface, uint8_t u8KeyCode)
 {
-    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Keyboard.Port);
+    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Keyboard.IPort);
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
@@ -1398 +1396 @@
 static DECLCALLBACK(void *)  kbdMouseQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
-    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Mouse.Base);
-    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
-        return &pThis->Mouse.Base;
-    if (RTUuidCompare2Strs(pszIID, PDMIMOUSEPORT_IID) == 0)
-        return &pThis->Mouse.Port;
+    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Mouse.IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->Mouse.IBase);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUSEPORT, &pThis->Mouse.IPort);
     return NULL;
 }
@@ -1413 +1409 @@
  *
  * @returns VBox status code.
- * @param   pInterface      Pointer to the mouse port interface (KBDState::Mouse.Port).
+ * @param   pInterface      Pointer to the mouse port interface (KBDState::Mouse.IPort).
  * @param   i32DeltaX       The X delta.
  * @param   i32DeltaY       The Y delta.
@@ -1421 +1417 @@
 static DECLCALLBACK(int) kbdMousePutEvent(PPDMIMOUSEPORT pInterface, int32_t i32DeltaX, int32_t i32DeltaY, int32_t i32DeltaZ, int32_t i32DeltaW, uint32_t fButtonStates)
 {
-    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Mouse.Port);
+    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Mouse.IPort);
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
@@ -1464 +1460 @@
         /* LUN #0: keyboard */
         case 0:
-            rc = PDMDevHlpDriverAttach(pDevIns, iLUN, &pThis->Keyboard.Base, &pThis->Keyboard.pDrvBase, "Keyboard Port");
+            rc = PDMDevHlpDriverAttach(pDevIns, iLUN, &pThis->Keyboard.IBase, &pThis->Keyboard.pDrvBase, "Keyboard Port");
             if (RT_SUCCESS(rc))
             {
@@ -1485 +1481 @@
         /* LUN #1: aux/mouse */
         case 1:
-            rc = PDMDevHlpDriverAttach(pDevIns, iLUN, &pThis->Mouse.Base, &pThis->Mouse.pDrvBase, "Aux (Mouse) Port");
+            rc = PDMDevHlpDriverAttach(pDevIns, iLUN, &pThis->Mouse.IBase, &pThis->Mouse.pDrvBase, "Aux (Mouse) Port");
             if (RT_SUCCESS(rc))
             {
@@ -1623 +1619 @@
     pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
-    pThis->Keyboard.Base.pfnQueryInterface  = kbdKeyboardQueryInterface;
-    pThis->Keyboard.Port.pfnPutEvent        = kbdKeyboardPutEvent;
-
-    pThis->Mouse.Base.pfnQueryInterface     = kbdMouseQueryInterface;
-    pThis->Mouse.Port.pfnPutEvent           = kbdMousePutEvent;
+    pThis->Keyboard.IBase.pfnQueryInterface = kbdKeyboardQueryInterface;
+    pThis->Keyboard.IPort.pfnPutEvent       = kbdKeyboardPutEvent;
+
+    pThis->Mouse.IBase.pfnQueryInterface    = kbdMouseQueryInterface;
+    pThis->Mouse.IPort.pfnPutEvent          = kbdMousePutEvent;
 
     /*