Changeset 59687 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Feb 15, 2016 6:52:31 PM (9 years ago)

Author:

vboxsync

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

105544

Message:

VUSB: Some structural cleanup (#1 Don't replicate the URB tagging for log enabled builds in every device emulation but move it to the roothub implementation )

Location:

trunk/src/VBox/Devices/USB

Files:

• DevOHCI.cpp (modified) (6 diffs)
• DrvVUSBRootHub.cpp (modified) (4 diffs)
• VUSBInternal.h (modified) (2 diffs)
• VUSBReadAhead.cpp (modified) (1 diff)

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

@@ -2731 +2731 @@
      * Allocate and initialize a new URB.
      */
-    PVUSBURB pUrb = VUSBIRhNewUrb(pThis->RootHub.pIRhConn, pEd->hwinfo & ED_HWINFO_FUNCTION, Buf.cbTotal, 1);
+    PVUSBURB pUrb = VUSBIRhNewUrb(pThis->RootHub.pIRhConn, pEd->hwinfo & ED_HWINFO_FUNCTION, enmType,
+                                  enmDir, Buf.cbTotal, 1, NULL);
     if (!pUrb)
         return false;                   /* retry later... */
     Assert(pUrb->Hci.cTds == 1);
 
-    pUrb->enmType = enmType;
     pUrb->EndPt = (pEd->hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
-    pUrb->enmDir = enmDir;
     pUrb->fShortNotOk = !(Td.hwinfo & TD_HWINFO_ROUNDING);
     pUrb->enmStatus = VUSBSTATUS_OK;
@@ -2747 +2746 @@
     AssertCompile(sizeof(pUrb->Hci.paTds[0].TdCopy) >= sizeof(Td));
     memcpy(pUrb->Hci.paTds[0].TdCopy, &Td, sizeof(Td));
-#ifdef LOG_ENABLED
-    static unsigned s_iSerial = 0;
-    s_iSerial = (s_iSerial + 1) % 10000;
-    RTStrAPrintf(&pUrb->pszDesc, "URB %p %10s/s%c%04d", pUrb, pszListName,
-                 enmDir == VUSBDIRECTION_IN ? '<' : enmDir == VUSBDIRECTION_OUT ? '>' : '-', s_iSerial);
-#endif
 
     /* copy data if out bound transfer. */
@@ -2890 +2883 @@
      * Allocate and initialize a new URB.
      */
-    PVUSBURB pUrb = VUSBIRhNewUrb(pThis->RootHub.pIRhConn, pEd->hwinfo & ED_HWINFO_FUNCTION, cbTotal, cTds);
+    PVUSBURB pUrb = VUSBIRhNewUrb(pThis->RootHub.pIRhConn, pEd->hwinfo & ED_HWINFO_FUNCTION, enmType,
+                                  enmDir, cbTotal, cTds, "ohciServiceTdMultiple");
     if (!pUrb)
         /* retry later... */
@@ -2905 +2899 @@
     pUrb->Hci.fUnlinked = false;
     pUrb->Hci.u32FrameNo = pThis->HcFmNumber;
-#ifdef LOG_ENABLED
-    static unsigned s_iSerial = 0;
-    s_iSerial = (s_iSerial + 1) % 10000;
-    RTStrAPrintf(&pUrb->pszDesc, "URB %p %10s/m%c%04d", pUrb, pszListName,
-                 enmDir == VUSBDIRECTION_IN ? '<' : enmDir == VUSBDIRECTION_OUT ? '>' : '-', s_iSerial);
-#endif
 
     /* Copy data and TD information. */
@@ -3103 +3091 @@
      * Allocate and initialize a new URB.
      */
-    PVUSBURB pUrb = VUSBIRhNewUrb(pThis->RootHub.pIRhConn, pEd->hwinfo & ED_HWINFO_FUNCTION, cbTotal, 1);
+    PVUSBURB pUrb = VUSBIRhNewUrb(pThis->RootHub.pIRhConn, pEd->hwinfo & ED_HWINFO_FUNCTION, VUSBXFERTYPE_ISOC,
+                                  enmDir, cbTotal, 1, NULL);
     if (!pUrb)
         /* retry later... */
         return false;
 
-    pUrb->enmType = VUSBXFERTYPE_ISOC;
     pUrb->EndPt = (pEd->hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
-    pUrb->enmDir = enmDir;
     pUrb->fShortNotOk = false;
     pUrb->enmStatus = VUSBSTATUS_OK;
@@ -3121 +3108 @@
 #if 0 /* color the data */
     memset(pUrb->abData, 0xfe, cbTotal);
-#endif
-#ifdef LOG_ENABLED
-    static unsigned s_iSerial = 0;
-    s_iSerial = (s_iSerial + 1) % 10000;
-    RTStrAPrintf(&pUrb->pszDesc, "URB %p isoc%c%04d", pUrb, enmDir == VUSBDIRECTION_IN ? '<' : '>', s_iSerial);
 #endif
 

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

@@ -367 +367 @@
  * Worker routine for vusbRhConnNewUrb() and vusbDevNewIsocUrb().
  */
-PVUSBURB vusbRhNewUrb(PVUSBROOTHUB pRh, uint8_t DstAddress, uint32_t cbData, uint32_t cTds)
+PVUSBURB vusbRhNewUrb(PVUSBROOTHUB pRh, uint8_t DstAddress, VUSBXFERTYPE enmType,
+                      VUSBDIRECTION enmDir, uint32_t cbData, uint32_t cTds, const char *pszTag)
 {
     /*
@@ -447 +448 @@
     pUrb->DstAddress = DstAddress;
     pUrb->EndPt = ~0;
-    pUrb->enmType = VUSBXFERTYPE_INVALID;
-    pUrb->enmDir = VUSBDIRECTION_INVALID;
+    pUrb->enmType = enmType;
+    pUrb->enmDir = enmDir;
     pUrb->fShortNotOk = false;
     pUrb->enmStatus = VUSBSTATUS_INVALID;
     pUrb->cbData = cbData;
+
+#ifdef LOG_ENABLED
+    const char *pszType = NULL;
+
+    switch(pUrb->enmType)
+    {
+        case VUSBXFERTYPE_CTRL:
+            pszType = "ctrl";
+            break;
+        case VUSBXFERTYPE_INTR:
+            pszType = "intr";
+            break;
+        case VUSBXFERTYPE_BULK:
+            pszType = "bulk";
+            break;
+        case VUSBXFERTYPE_ISOC:
+            pszType = "isoc";
+            break;
+        default:
+            pszType = "invld";
+            break;
+    }
+
+    pRh->iSerial = (pRh->iSerial + 1) % 10000;
+    RTStrAPrintf(&pUrb->pszDesc, "URB %p %s%c%04d (%s)", pUrb, pszType,
+                 (pUrb->enmDir == VUSBDIRECTION_IN) ? '<' : ((pUrb->enmDir == VUSBDIRECTION_SETUP) ? 's' : '>'),
+                 pRh->iSerial, pszTag ? pszTag : "<none>");
+#endif
+
     return pUrb;
 }
@@ -457 +487 @@
 
 /** @copydoc VUSBIROOTHUBCONNECTOR::pfnNewUrb */
-static DECLCALLBACK(PVUSBURB) vusbRhConnNewUrb(PVUSBIROOTHUBCONNECTOR pInterface, uint8_t DstAddress, uint32_t cbData, uint32_t cTds)
+static DECLCALLBACK(PVUSBURB) vusbRhConnNewUrb(PVUSBIROOTHUBCONNECTOR pInterface, uint8_t DstAddress, VUSBXFERTYPE enmType,
+                                               VUSBDIRECTION enmDir, uint32_t cbData, uint32_t cTds, const char *pszTag)
 {
     PVUSBROOTHUB pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
-    return vusbRhNewUrb(pRh, DstAddress, cbData, cTds);
+    return vusbRhNewUrb(pRh, DstAddress, enmType, enmDir, cbData, cTds, pszTag);
 }
 
@@ -1030 +1061 @@
     pThis->IRhConnector.pfnDetachDevice = vusbRhDetachDevice;
     pThis->hSniffer                     = VUSBSNIFFER_NIL;
+    pThis->iSerial                      = 0;
     /*
      * Resolve interface(s).

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -364 +364 @@
     /** Version of the attached Host Controller. */
     uint32_t                fHcVersions;
+#ifdef LOG_ENABLED
+    /** A serial number for URBs submitted on the roothub instance.
+     * Only logging builds. */
+    uint32_t                iSerial;
+    /** Alignment */
+    uint32_t                Alignment2;
+#endif
 #ifdef VBOX_WITH_STATISTICS
     VUSBROOTHUBTYPESTATS    Total;
@@ -441 +448 @@
 int  vusbUrbQueueAsyncRh(PVUSBURB pUrb);
 int  vusbUrbSubmitBufferedRead(PVUSBURB pUrb, VUSBREADAHEAD hReadAhead);
-PVUSBURB vusbRhNewUrb(PVUSBROOTHUB pRh, uint8_t DstAddress, uint32_t cbData, uint32_t cTds);
+PVUSBURB vusbRhNewUrb(PVUSBROOTHUB pRh, uint8_t DstAddress, VUSBXFERTYPE enmType, VUSBDIRECTION enmDir,
+                      uint32_t cbData, uint32_t cTds, const char *pszTag);
 
 

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

@@ -110 +110 @@
         return NULL;
 
-    pUrb = vusbRhNewUrb(pRh, pDev->u8Address, cbTotal, 1);
+    pUrb = vusbRhNewUrb(pRh, pDev->u8Address, VUSBXFERTYPE_ISOC, VUSBDIRECTION_IN, cbTotal, 1, NULL);
     if (!pUrb)
         /* not much we can do here... */
         return NULL;
 
-    pUrb->enmType               = VUSBXFERTYPE_ISOC;
     pUrb->EndPt                 = uEndPt;
-    pUrb->enmDir                = VUSBDIRECTION_IN;
     pUrb->fShortNotOk           = false;
     pUrb->enmStatus             = VUSBSTATUS_OK;