[USBEHCI]

- Try fix alignment of USBEHCI_HCD_ITD (needs 32 byte aligned)
- Store active ITD in EHCI_TRANSFER and use it for completion checks
- Implement USBD_START_ISO_TRANSFER_ASAP flag support
- Fix USBPORT_AllocateTransfer for iso packets with MDL (unused)
[USBVIDEO]
- Silence traces
- Readd frame patching

Author: janderwald

drivers/usb/usbehci/usbehci.c

@@ -37,6 +37,9 @@ extern USBPORT_REGISTRATION_PACKET RegPacket;
 
 #define EHCI_MAX_HC_SYSTEM_ERRORS  256
 
+#define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l))
+#define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
+
 typedef struct _EHCI_PERIOD {
   UCHAR Period;
   UCHAR PeriodIdx;
@@ -107,12 +110,12 @@ typedef struct _EHCI_HCD_ITD {
   LIST_ENTRY DoneLink;
   ULONG ScheduledFrame; /* Frame list index where this iTD was inserted */
 #ifdef _WIN64
-  ULONG Pad[7];
+  ULONG Pad[23];
 #else
-  ULONG Pad[13];
+  ULONG Pad[41];
 #endif
 } EHCI_HCD_ITD, *PEHCI_HCD_ITD;
-
+C_ASSERT(sizeof(EHCI_HCD_ITD) == ROUND_UP(sizeof(EHCI_HCD_ITD), 32));
 
 /* Split Isochronous Transfer Descriptor */
 typedef struct _EHCI_HCD_SITD {
@@ -220,6 +223,7 @@ typedef struct _EHCI_TRANSFER {
   ULONG USBDStatus;
   ULONG TransferLen;
   PEHCI_ENDPOINT EhciEndpoint;
+  PEHCI_HCD_ITD ActiveITD;
   ULONG PendingTDs;
   ULONG TransferOnAsyncList;
 } EHCI_TRANSFER, *PEHCI_TRANSFER;
@@ -406,12 +410,13 @@ NTAPI
 EHCI_CheckIsoBandwidth(IN PEHCI_EXTENSION EhciExtension,
                        IN PEHCI_ENDPOINT EhciEndpoint,
                        IN ULONG TransferLength);
-  
+
 VOID
 NTAPI
 EHCI_UnlinkITDFromFrameList(IN PEHCI_EXTENSION EhciExtension,
                             IN PEHCI_HCD_ITD ITD,
-                            IN ULONG Frame);
+                            IN ULONG Frame,
+                            IN PEHCI_TRANSFER EhciTransfer);
 
 VOID
 NTAPI
@@ -423,5 +428,5 @@ EHCI_InitializeITD(IN PEHCI_EXTENSION EhciExtension,
                    IN ULONG BufferPhysicalAddress,
                    IN ULONG TransferLength,
                    IN ULONG MicroframeNumber);
-            
+
 #endif /* USBEHCI_H__ */

drivers/usb/usbehci/usbehci.h

@@ -60,6 +60,8 @@ USBPORT_InitializeIsoTransfer(PDEVICE_OBJECT FdoDevice,
     ULONG TotalPackets, Idx;
     ULONG Period;
     BOOLEAN IsHighSpeed;
+    PUSBPORT_DEVICE_EXTENSION FdoExtension;
+    PUSBPORT_REGISTRATION_PACKET Packet;
 
     DPRINT("USBPORT_InitializeIsoTransfer: FdoDevice - %p, Urb - %p Irp - %p\n", FdoDevice, Urb, Transfer->Irp);
 
@@ -98,6 +100,14 @@ USBPORT_InitializeIsoTransfer(PDEVICE_OBJECT FdoDevice,
     IsoBlock->TotalPackets = TotalPackets;
     IsoBlock->MappedBuffer = (PVOID)SgTable->MappedSystemVa;
 
+    if (Urb->TransferFlags & USBD_START_ISO_TRANSFER_ASAP)
+    {
+        FdoExtension = FdoDevice->DeviceExtension;
+        Packet = &FdoExtension->MiniPortInterface->Packet;
+        Urb->StartFrame = (Packet->Get32BitFrameNumber(FdoExtension->MiniPortExt) + 64) & 0xFFFFFFF0;
+        DPRINT("Urb StartFrame %u\n", Urb->StartFrame);
+    }
+
     /*
      * Walk each URB packet descriptor, compute its actual byte length
      * from the offset array, resolve the physical scatter/gather mapping,
@@ -208,7 +218,6 @@ USBPORT_CompleteIsoTransfer(IN PVOID MiniPortExtension,
                             IN PVOID TransferParameters,
                             IN ULONG TransferLength)
 {
-    PUSBPORT_DEVICE_EXTENSION FdoExtension;
     PUSBPORT_ENDPOINT Endpoint;
     PUSBPORT_TRANSFER Transfer;
     struct _URB_ISOCH_TRANSFER *IsoUrb;

drivers/usb/usbport/iso.c

@@ -2664,14 +2664,29 @@ USBPORT_AllocateTransfer(IN PDEVICE_OBJECT FdoDevice,
 
     if (TransferLength)
     {
-        Mdl = Urb->UrbControlTransfer.TransferBufferMDL;
-        VirtualAddr = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl);
+        if (Urb->UrbHeader.Function == URB_FUNCTION_CONTROL_TRANSFER)
+        {
+            Mdl = Urb->UrbControlTransfer.TransferBufferMDL;
+            VirtualAddr = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl);
 
-        PagesNeed = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddr,
+            PagesNeed = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddr,
                                                    TransferLength);
-        if (PagesNeed > 0)
+            if (PagesNeed > 0)
+            {
+                PagesNeed--;
+            }
+        }
+        else if (Urb->UrbHeader.Function == URB_FUNCTION_ISOCH_TRANSFER)
         {
-            PagesNeed--;
+            Mdl = Urb->UrbIsochronousTransfer.TransferBufferMDL;
+            VirtualAddr = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl);
+
+            PagesNeed = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddr,
+                                                   TransferLength);
+            if (PagesNeed > 0)
+            {
+                PagesNeed--;
+            }
         }
     }
 

drivers/usb/usbport/usbport.c

@@ -6,7 +6,7 @@
 * PROGRAMMERS:
 *              Johannes Anderwald (johannes.anderwald@reactos.org)
 */
-#define YDEBUG
+#define NDEBUG
 #include "usbvideo.h"
 
 

drivers/usb/usbvideo/bulk.c

@@ -105,7 +105,7 @@ USBVideoIsoReadComplete(
         USBVideoQueueIsoRead(Pin,
                               DeviceExtension->hPipe,
                               (PUCHAR)Urb->UrbIsochronousTransfer.TransferBuffer,
-                              32 * 1024,
+                              ISO_TRANSFER_SIZE,
                               Irp,
                               Urb,
                               Frame);
@@ -184,7 +184,7 @@ USBVideoIsoReadComplete(
     USBVideoQueueIsoRead(Pin,
                           DeviceExtension->hPipe,
                           (PUCHAR)Urb->UrbIsochronousTransfer.TransferBuffer,
-                          32 * 1024,
+                          ISO_TRANSFER_SIZE,
                           Irp,
                           Urb,
                           Frame);

drivers/usb/usbvideo/iso.c

@@ -55,7 +55,7 @@ USBVideoPinSetDeviceState(
                     Pin,
                     DeviceExtension->hPipe,
                     DeviceExtension->BulkBuffer[Index],
-                    32* 1024,
+                    ISO_TRANSFER_SIZE,
                     DeviceExtension->Irp[Index],
                     DeviceExtension->Urb[Index],
                     &DeviceExtension->FrameCtx[Index]);
@@ -146,11 +146,9 @@ USBVideoGetDataRangeIndexForFormat(
 
     }
     //HACK return first available format
-    *FormatIndex = DeviceExtension->VideoFormatInfo[0].bFormatIndex;
-    *FrameIndex = DeviceExtension->VideoFormatInfo[0].bFrameIndex;
-    *dwFrameInterval = DeviceExtension->VideoFormatInfo[0].dwFrameInterval;
-
-    ASSERT(FALSE);
+    *FormatIndex = DeviceExtension->VideoFormatInfo[2].bFormatIndex;
+    *FrameIndex = DeviceExtension->VideoFormatInfo[2].bFrameIndex;
+    *dwFrameInterval = DeviceExtension->VideoFormatInfo[2].dwFrameInterval;
     return STATUS_SUCCESS;
 }
 
@@ -543,7 +541,7 @@ USBVideoPinCreate(
             return STATUS_INSUFFICIENT_RESOURCES;
         }
 
-        DeviceExtension->BulkBuffer[i] = AllocFunction(32 * 1024);
+        DeviceExtension->BulkBuffer[i] = AllocFunction(ISO_TRANSFER_SIZE);
         if (!DeviceExtension->BulkBuffer[i])
         {
             /* no memory */

drivers/usb/usbvideo/pin.c

@@ -60,8 +60,9 @@ typedef struct
 }STILL_PROBE_COMMIT, *PSTILL_PROBE_COMMIT;;
 
 
-#define ISO_PACKET_COUNT 8
+#define ISO_PACKET_COUNT 24 // FIXME determine packet count by bInterval
 #define BULK_TRANSFER_SIZE  (64*1024)
+#define ISO_TRANSFER_SIZE (64*1024)
 #define URB_POOL_COUNT    4
 
 typedef struct _FRAME_CONTEXT {

drivers/usb/usbvideo/usbvideo.h

@@ -6,7 +6,7 @@
 * PROGRAMMERS:
 *              Johannes Anderwald (johannes.anderwald@reactos.org)
 */
-#define YDEBUG
+#define NDEBUG
 #include "usbvideo.h"
 
 static const JFIF_APP0 g_JfifApp0 = {
@@ -37,20 +37,20 @@ UvcPatchAvi1ToJfif(
 
     if (pFrame[0] != 0xFF || pFrame[1] != 0xD8)
     {
-        DPRINT1("invalid soi\n");
+        DPRINT("invalid soi\n");
         return STATUS_INVALID_PARAMETER;
     }
 
     if (pFrame[2] != 0xFF || pFrame[3] != 0xE0)
     {
-        DPRINT1("no app maker\n");
+        DPRINT("no app maker\n");
         return STATUS_INVALID_PARAMETER;
     }
 
     USHORT app0Len = (pFrame[4] << 8) | pFrame[5];
     if (frameSize < (ULONG)(2 + 2 + app0Len))
     {
-        DPRINT1("unexpected app0len\n");
+        DPRINT("unexpected app0len\n");
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -122,6 +122,7 @@ USBVideoDeliverFrame(
 {
     PKSSTREAM_POINTER StreamPointer;
     PKSPIN Pin;
+    NTSTATUS Status;
 
     if (!DeviceExtension || !DeviceExtension->Pin)
     {
@@ -151,12 +152,19 @@ USBVideoDeliverFrame(
     if (BytesToCopy > 0)
     {
         DPRINT("USBVideoDeliverFrame: Copying %u bytes to user buffer (frame size %u)\n", BytesToCopy, FrameSize);
-        RtlCopyMemory(StreamPointer->StreamHeader->Data, FrameBuffer, BytesToCopy);
-        StreamPointer->StreamHeader->DataUsed = BytesToCopy;
-        
-        /* Advance the stream pointer to deliver the buffer */
-        KsStreamPointerAdvance(StreamPointer);
-        DPRINT("USBVideoDeliverFrame: Frame delivered\n");
+        Status = UvcPatchAvi1ToJfif(FrameBuffer, BytesToCopy, StreamPointer->StreamHeader->Data, &BytesToCopy);
+        //RtlCopyMemory(StreamPointer->StreamHeader->Data, FrameBuffer, BytesToCopy);
+        //Status = STATUS_SUCCESS;
+        if (NT_SUCCESS(Status))
+        {
+            /* Advance the stream pointer to deliver the buffer */
+            KsStreamPointerAdvanceOffsetsAndUnlock(StreamPointer, 0, BytesToCopy, FALSE);
+            KsStreamPointerUnlock(StreamPointer, FALSE);
+        }
+        else
+        {
+            KsStreamPointerUnlock(StreamPointer, FALSE);
+        }
     }
     else
     {