Changeset 52525 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 29, 2014 9:37:55 AM (10 years ago)

Author:

vboxsync

Message:

memset. arg.

File:

• trunk/src/VBox/Devices/USB/VUSBDevice.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1224 +1224 @@
     /* Remove the configuration */
     pDev->pCurCfgDesc = NULL;
-    for (unsigned i = 0; i < VUSB_PIPE_MAX; i++)
+    for (unsigned i = 0; i < RT_ELEMENTS(pDev->aPipes); i++)
     {
         vusbMsgFreeExtraData(pDev->aPipes[i].pCtrl);
+        pDev->aPipes[i].pCtrl = NULL;
 
         if (pDev->aPipes[i].hReadAhead)
@@ -1233 +1234 @@
             pDev->aPipes[i].hReadAhead = NULL;
         }
-    }
-    memset(pDev->aPipes, 0, sizeof(pDev->aPipes));
+
+        RT_ZERO(pDev->aPipes[i].in);
+        RT_ZERO(pDev->aPipes[i].out);
+        pDev->aPipes[i].async = 0;
+    }
     return VINF_SUCCESS;
 }
@@ -1263 +1267 @@
     TMR3TimerDestroy(pDev->pResetTimer);
     pDev->pResetTimer = NULL;
-    for (unsigned i = 0; i < VUSB_PIPE_MAX; i++)
+    for (unsigned i = 0; i < RT_ELEMENTS(pDev->aPipes); i++)
         RTCritSectDelete(&pDev->aPipes[i].CritSectCtrl);