vbox的更動 25966 路徑 trunk/src/VBox/Devices/Input/DevPS2.cpp

時間撮記:

2010-1-22 上午11:15:43 (15 年 以前)

作者:

vboxsync

訊息:

PDMIBASE refactoring; use UUID as interface IDs.

檔案:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (修改) (7 筆差異)

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

@@ -53 +53 @@
 #include <VBox/pdmdev.h>
 #include <iprt/assert.h>
+#include <iprt/uuid.h>
 
 #include "../Builtins.h"
@@ -221 +222 @@
     /**
      * Keyboard port - LUN#0.
+     *
+     * @implements  PDMIBASE
+     * @implements  PDMIKEYBOARDPORT
      */
     struct
@@ -237 +241 @@
     /**
      * Mouse port - LUN#1.
+     *
+     * @implements  PDMIBASE
+     * @implements  PDMIMOUSEPORT
      */
     struct
@@ -1349 +1356 @@
 
 /**
- * Queries an interface to the driver.
- *
- * @returns Pointer to interface.
- * @returns NULL if the interface was not supported by the device.
- * @param   pInterface          Pointer to the keyboard port base interface (KBDState::Keyboard.Base).
- * @param   enmInterface        The requested interface identification.
- */
-static DECLCALLBACK(void *)  kbdKeyboardQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
-{
-    KBDState *pThis = (KBDState *)((uintptr_t)pInterface -  RT_OFFSETOF(KBDState, Keyboard.Base));
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pThis->Keyboard.Base;
-        case PDMINTERFACE_KEYBOARD_PORT:
-            return &pThis->Keyboard.Port;
-        default:
-            return NULL;
-    }
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+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, PDMINTERFACE_KEYBOARD_PORT) == 0)
+        return &pThis->Keyboard.Port;
+    return NULL;
 }
 
 
 /* -=-=-=-=-=- Keyboard: IKeyboardPort  -=-=-=-=-=- */
-
-/** Converts a keyboard port interface pointer to a keyboard state pointer. */
-#define IKEYBOARDPORT_2_KBDSTATE(pInterface) ( (KBDState *)((uintptr_t)pInterface -  RT_OFFSETOF(KBDState, Keyboard.Port)) )
 
 /**
@@ -1385 +1380 @@
 static DECLCALLBACK(int) kbdKeyboardPutEvent(PPDMIKEYBOARDPORT pInterface, uint8_t u8KeyCode)
 {
-    KBDState *pThis = IKEYBOARDPORT_2_KBDSTATE(pInterface);
+    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Keyboard.Port);
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
+
     pc_kbd_put_keycode(pThis, u8KeyCode);
+
     PDMCritSectLeave(&pThis->CritSect);
     return VINF_SUCCESS;
@@ -1397 +1394 @@
 
 /**
- * Queries an interface to the driver.
- *
- * @returns Pointer to interface.
- * @returns NULL if the interface was not supported by the device.
- * @param   pInterface          Pointer to the mouse port base interface (KBDState::Mouse.Base).
- * @param   enmInterface        The requested interface identification.
- */
-static DECLCALLBACK(void *)  kbdMouseQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
-{
-    KBDState *pThis = (KBDState *)((uintptr_t)pInterface -  RT_OFFSETOF(KBDState, Mouse.Base));
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pThis->Mouse.Base;
-        case PDMINTERFACE_MOUSE_PORT:
-            return &pThis->Mouse.Port;
-        default:
-            return NULL;
-    }
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
+ */
+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, PDMINTERFACE_MOUSE_PORT) == 0)
+        return &pThis->Mouse.Port;
+    return NULL;
 }
 
 
 /* -=-=-=-=-=- Mouse: IMousePort  -=-=-=-=-=- */
-
-/** Converts a mouse port interface pointer to a keyboard state pointer. */
-#define IMOUSEPORT_2_KBDSTATE(pInterface) ( (KBDState *)((uintptr_t)pInterface -  RT_OFFSETOF(KBDState, Mouse.Port)) )
 
 /**
@@ -1436 +1421 @@
 static DECLCALLBACK(int) kbdMousePutEvent(PPDMIMOUSEPORT pInterface, int32_t i32DeltaX, int32_t i32DeltaY, int32_t i32DeltaZ, int32_t i32DeltaW, uint32_t fButtonStates)
 {
-    KBDState *pThis = IMOUSEPORT_2_KBDSTATE(pInterface);
+    KBDState *pThis = RT_FROM_MEMBER(pInterface, KBDState, Mouse.Port);
     int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
+
     pc_kbd_mouse_event(pThis, i32DeltaX, i32DeltaY, i32DeltaZ, i32DeltaW, fButtonStates);
+
     PDMCritSectLeave(&pThis->CritSect);
     return VINF_SUCCESS;