Changeset 25966 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jan 22, 2010 11:15:43 AM (15 years ago)

Author:

vboxsync

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

56818

Message:

PDMIBASE refactoring; use UUID as interface IDs.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (2 diffs)
• VMMDevState.h (modified) (2 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -42 +42 @@
 #ifndef IN_RC
 # include <iprt/mem.h>
+#endif
+#ifdef IN_RING3
+# include <iprt/uuid.h>
 #endif
 
@@ -1825 +1828 @@
 
 /**
- * Queries an interface to the driver.
- *
- * @returns Pointer to interface.
- * @returns NULL if the interface was not supported by the driver.
- * @param   pInterface          Pointer to this interface structure.
- * @param   enmInterface        The requested interface identification.
- * @thread  Any thread.
+ * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) vmmdevPortQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
-{
-    VMMDevState *pThis = (VMMDevState*)((uintptr_t)pInterface - RT_OFFSETOF(VMMDevState, Base));
-    switch (enmInterface)
-    {
-        case PDMINTERFACE_BASE:
-            return &pThis->Base;
-        case PDMINTERFACE_VMMDEV_PORT:
-            return &pThis->Port;
+static DECLCALLBACK(void *) vmmdevPortQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    VMMDevState *pThis = RT_FROM_MEMBER(pInterface, VMMDevState, Base);
+
+    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
+        return &pThis->Base;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_VMMDEV_PORT) == 0)
+        return &pThis->Port;
 #ifdef VBOX_WITH_HGCM
-        case PDMINTERFACE_HGCM_PORT:
-            return &pThis->HGCMPort;
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_HGCM_PORT) == 0)
+        return &pThis->HGCMPort;
 #endif
-        case PDMINTERFACE_LED_PORTS:
-            /* Currently only for shared folders */
-            return &pThis->SharedFolders.ILeds;
-        default:
-            return NULL;
-    }
+    if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_LED_PORTS) == 0)
+        /* Currently only for shared folders */
+        return &pThis->SharedFolders.ILeds;
+    return NULL;
 }
 

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -51 +51 @@
     /** Pointer to device instance. */
     PPDMDEVINSR3 pDevIns;
-    /** VMMDev port base interface. */
+    /** LUN\#0 + Status: VMMDev port base interface. */
     PDMIBASE Base;
-    /** VMMDev port interface. */
+    /** LUN\#0: VMMDev port interface. */
     PDMIVMMDEVPORT Port;
 #ifdef VBOX_WITH_HGCM
-    /** HGCM port interface. */
+    /** LUN\#0: HGCM port interface. */
     PDMIHGCMPORT HGCMPort;
 #endif
@@ -188 +188 @@
 #endif /* VBOX_WITH_HGCM */
 
-    /* Shared folders LED */
+    /** Status LUN: Shared folders LED */
     struct
     {