Changeset 14264 in vbox

Timestamp:

Nov 17, 2008 5:49:17 PM (16 years ago)

Author:

vboxsync

Message:

VBoxGuest.cpp: @todo r=bird: merge callback code.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -919 +919 @@
 }
 
-#ifdef HGCM_TIMEOUT
+
+# ifdef HGCM_TIMEOUT
 /**
  * This is a callback for dealing with async waits with a timeout.
  *
  * It operates in a manner similar to VBoxGuestCommonIOCtl_WaitEvent.
+ * @todo r=bird: merge VBoxGuestHGCMAsyncWaitCallbackTimeout into
+ *       VBoxGuestHGCMAsyncWaitCallback, either by using a stack argument or
+ *       (better) create a common worker for them
  */
 static DECLCALLBACK(void)
-VBoxGuestHGCMAsyncWaitCallbackTimeout(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser,
-                                      uint32_t u32User)
+VBoxGuestHGCMAsyncWaitCallbackTimeout(VMMDevHGCMRequestHeader *pHdrNonVolatile, void *pvUser, uint32_t u32User)
 {
     VMMDevHGCMRequestHeader volatile *pHdr = (VMMDevHGCMRequestHeader volatile *)pHdrNonVolatile;
@@ -991 +994 @@
     RTSpinlockReleaseNoInts(pDevExt->WaitSpinlock, &Tmp);
 }
-#endif /* HGCM_TIMEOUT */
+# endif /* HGCM_TIMEOUT */
 
 
@@ -1096 +1099 @@
 
 
+/** @remarks Identical to VBoxGuestCommonIOCtl_HGCMCallTimeout. */
 static int VBoxGuestCommonIOCtl_HGCMCall(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, VBoxGuestHGCMCallInfo *pInfo,
                                          size_t cbData, size_t *pcbDataReturned)
@@ -1153 +1157 @@
 
 
-#ifdef HGCM_TIMEOUT
+# ifdef HGCM_TIMEOUT
+/** @remarks Identical to VBoxGuestCommonIOCtl_HGCMCall. */
 static int VBoxGuestCommonIOCtl_HGCMCallTimeout(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession, VBoxGuestHGCMCallInfoTimeout *pInfoTimeout,
-                                         size_t cbData, size_t *pcbDataReturned)
+                                                size_t cbData, size_t *pcbDataReturned)
 {
     VBoxGuestHGCMCallInfo *pInfo = &pInfoTimeout->info;
@@ -1210 +1215 @@
     return rc;
 }
-#endif /* HGCM_TIMEOUT */
+# endif /* HGCM_TIMEOUT */
 
 
@@ -1254 +1259 @@
     Info.result = (uint32_t)VERR_WRONG_ORDER;
 
-    rc = VbglHGCMConnect(&Info,VBoxGuestHGCMAsyncWaitCallback, pDevExt, 0);
+    rc = VbglHGCMConnect(&Info, VBoxGuestHGCMAsyncWaitCallback, pDevExt, 0);
     if (RT_FAILURE(rc))
     {
@@ -1364 +1369 @@
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, cbData, pcbDataReturned);
     }
-#ifdef HGCM_TIMEOUT
+# ifdef HGCM_TIMEOUT
     else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_TIMEOUT(0)))
     {
-        CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfoTimeout));
+        CHECKRET_MIN_SIZE("HGCM_CALL_TIMEOUT", sizeof(VBoxGuestHGCMCallInfoTimeout));
         rc = VBoxGuestCommonIOCtl_HGCMCallTimeout(pDevExt, pSession, (VBoxGuestHGCMCallInfoTimeout *)pvData, cbData, pcbDataReturned);
     }
-#endif /* HGCM_TIMEOUT */
+# endif /* HGCM_TIMEOUT */
 #endif /* VBOX_WITH_HGCM */
     else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_LOG(0)))