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

Timestamp:

Feb 21, 2013 6:14:07 PM (12 years ago)

Author:

vboxsync

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

83907

Message:

Some nits, use RT_FROM_MEMBER now that we've finally got it.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (modified) (8 diffs)

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

@@ -47 +47 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-typedef enum _VBOXHGCMCMDTYPE
+typedef enum VBOXHGCMCMDTYPE
 {
     VBOXHGCMCMDTYPE_LOADSTATE = 0,
@@ -59 +59 @@
  * Information about a linear ptr parameter.
  */
-typedef struct _VBOXHGCMLINPTR
+typedef struct VBOXHGCMLINPTR
 {
     /** Index of the parameter. */
@@ -118 +118 @@
     VBOXHGCMLINPTR *paLinPtrs;
 };
+
+
 
 static int vmmdevHGCMCmdListLock (PVMMDEV pThis)
@@ -1768 +1770 @@
 }
 
-#define PDMIHGCMPORT_2_VMMDEVSTATE(pInterface) ( (VMMDevState *) ((uintptr_t)pInterface - RT_OFFSETOF(VMMDevState, IHGCMPort)) )
-
 DECLCALLBACK(void) hgcmCompletedWorker (PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmd)
 {
-    PVMMDEV pThis = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDevState, IHGCMPort);
 #ifdef VBOX_WITH_DTRACE
     uint32_t idFunction = 0;
@@ -1840 +1840 @@
          * 3.0 blocker.)
          */
-        /** @todo s/pThis/pThis/g */
         /** @todo It would be faster if this interface would use MMIO2 memory and we
          *        didn't have to mess around with PDMDevHlpPhysRead/Write. We're
@@ -2221 +2220 @@
 DECLCALLBACK(void) hgcmCompleted (PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmd)
 {
-    PVMMDEV pThis = PDMIHGCMPORT_2_VMMDEVSTATE(pInterface);
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDevState, IHGCMPort);
 
     VBOXDD_HGCMCALL_COMPLETED_REQ(pCmd, result);
@@ -2233 +2232 @@
 }
 
-/* @thread EMT */
+/** @thread EMT */
 int vmmdevHGCMSaveState(PVMMDEV pThis, PSSMHANDLE pSSM)
 {
@@ -2521 +2520 @@
 }
 
-/* @thread EMT */
+/** @thread EMT */
 int vmmdevHGCMLoadStateDone(PVMMDEV pThis, PSSMHANDLE pSSM)
 {