Changeset 65976 in vbox

Timestamp:

Mar 7, 2017 12:13:49 PM (8 years ago)

Author:

vboxsync

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

113802

Message:

VUSB: Removed unused 'buffered pipe' code.

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBBufferedPipe.cpp (deleted)
• VUSBDevice.cpp (modified) (4 diffs)
• VUSBInternal.h (modified) (4 diffs)
• VUSBUrb.cpp (modified) (2 diffs)
• VUSBUrbPool.cpp (modified) (1 diff)

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

@@ -142 +142 @@
         Log(("vusb: map output pipe on address %u\n", i8Addr));
         pPipe->out = pEndPtDesc;
-
-#if 0
-        if ((pEndPtDesc->Core.bmAttributes & 0x03) == 1)
-        {
-            int rc = vusbBufferedPipeCreate(pDev, pPipe, VUSBDIRECTION_OUT, pDev->pUsbIns->enmSpeed,
-                                            32 /* cLatencyMs*/, &pPipe->hBuffer);
-            if (RT_SUCCESS(rc))
-                LogRel(("VUSB: Created a buffered pipe for isochronous output endpoint\n"));
-            else
-                LogRel(("VUSB: Failed to create a buffered pipe for isochronous output endpoint with rc=%Rrc\n", rc));
-        }
-#endif
     }
 
@@ -181 +169 @@
         Log(("vusb: unmap IN pipe from address %u (%#x)\n", EndPt, pEndPtDesc->Core.bEndpointAddress));
         pPipe->in = NULL;
-
-        /* Terminate the pipe buffer if created. */
-        if (pPipe->hBuffer)
-        {
-            vusbBufferedPipeDestroy(pPipe->hBuffer);
-            pPipe->hBuffer = NULL;
-        }
     }
     else
@@ -193 +174 @@
         Log(("vusb: unmap OUT pipe from address %u (%#x)\n", EndPt, pEndPtDesc->Core.bEndpointAddress));
         pPipe->out = NULL;
-
-        /* Terminate the pipe buffer if created. */
-        if (pPipe->hBuffer)
-        {
-            vusbBufferedPipeDestroy(pPipe->hBuffer);
-            pPipe->hBuffer = NULL;
-        }
     }
 
@@ -236 +210 @@
     vusbMsgFreeExtraData(pPipe->pCtrl);
     pPipe->pCtrl = NULL;
-
-    if (pPipe->hBuffer)
-    {
-        vusbBufferedPipeDestroy(pPipe->hBuffer);
-        pPipe->hBuffer = NULL;
-    }
 
     RT_ZERO(pPipe->in);

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

@@ -96 +96 @@
     /** Submit timestamp. (logging only) */
     uint64_t        u64SubmitTS;
-    /** Opaque data holder when this is an URB from a buffered pipe. */
-    void            *pvBuffered;
 } VUSBURBVUSBINT;
 
@@ -147 +145 @@
 void vusbMsgResetExtraData(PVUSBCTRLEXTRA pExtra);
 
-/** Opaque VUSB buffered pipe management handle. */
-typedef struct VUSBBUFFEREDPIPEINT *VUSBBUFFEREDPIPE;
-/** Pointer to a VUSB buffered pipe handle. */
-typedef VUSBBUFFEREDPIPE *PVUSBBUFFEREDPIPE;
-
 /**
  * A VUSB pipe
@@ -165 +158 @@
     /** Count of active async transfers. */
     volatile uint32_t   async;
-    /** Pipe buffer - only valid for isochronous endpoints. */
-    VUSBBUFFEREDPIPE    hBuffer;
 } VUSBPIPE;
 /** Pointer to a VUSB pipe structure. */
@@ -527 +518 @@
 
 /**
- * Completes an URB from a buffered pipe.
- *
- * @returns nothing.
- * @param   pUrb        The URB to complete.
- */
-DECLHIDDEN(void) vusbBufferedPipeCompleteUrb(PVUSBURB pUrb);
-
-/**
- * Creates a new buffered pipe.
- *
- * @returns VBox status code.
- * @retval  VERR_NOT_SUPPORTED if buffering is not supported for the given pipe.
- * @param   pDev         The device instance the pipe is associated with.
- * @param   pPipe        The pipe to buffer.
- * @param   enmDirection The direction for the buffering.
- * @param   enmSpeed     USB device speed.
- * @param   cLatencyMs   The maximum latency the buffering should introduce, this influences
- *                       the amount of data to buffer.
- * @param   phBuffer     Where to store the handle to the buffer on success.
- */
-DECLHIDDEN(int)  vusbBufferedPipeCreate(PVUSBDEV pDev, PVUSBPIPE pPipe, VUSBDIRECTION enmDirection,
-                                        VUSBSPEED enmSpeed, uint32_t cLatencyMs,
-                                        PVUSBBUFFEREDPIPE phBuffer);
-
-/**
- * Destroys a buffered pipe, freeing all acquired resources.
- *
- * @returns nothing.
- * @param   hBuffer     The buffered pipe handle.
- */
-DECLHIDDEN(void) vusbBufferedPipeDestroy(VUSBBUFFEREDPIPE hBuffer);
-
-/**
- * Submits a URB from the HCD which is subject to buffering.
- *
- * @returns VBox status code.
- * @param   hBuffer     The buffered pipe handle.
- * @param   pUrb        The URB from the HCD which is subject to buffering.
- */
-DECLHIDDEN(int)  vusbBufferedPipeSubmitUrb(VUSBBUFFEREDPIPE hBuffer, PVUSBURB pUrb);
-
-/**
  * Initializes the given URB pool.
  *

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

@@ -1184 +1184 @@
     }
 
-#ifdef VBOX_WITH_USB
-    if (pPipe && pPipe->hBuffer)
-    {
-        rc = vusbBufferedPipeSubmitUrb(pPipe->hBuffer, pUrb);
-        return rc;
-    }
-#endif
-
     /*
      * Take action based on type.
@@ -1332 +1324 @@
     if (pUrb->enmState == VUSBURBSTATE_REAPED)
         vusbUrbUnlink(pUrb);
-#ifdef VBOX_WITH_USB
-    // Read-ahead URBs are handled differently
-    if (pUrb->pVUsb->pvBuffered)
-        vusbBufferedPipeCompleteUrb(pUrb);
-    else
-#endif
-        vusbUrbCompletionRh(pUrb);
+
+    vusbUrbCompletionRh(pUrb);
 }
 

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

@@ -204 +204 @@
     pUrb->pVUsb->pCtrlUrb        = NULL;
     pUrb->pVUsb->u64SubmitTS     = 0;
-    pUrb->pVUsb->pvBuffered      = NULL;
     pUrb->Dev.pvPrivate          = NULL;
     pUrb->Dev.pNext              = NULL;