[USBEHCI]

- Rewrite linking of iso td
[USBPORT]
- Misc iso fixes
[USBVIDEO]
- Fix buffer calculation

Author: janderwald

drivers/usb/usbehci/usbehci.c

@@ -2620,6 +2620,7 @@ EHCI_SubmitIsoTransfer(IN PVOID ehciExtension,
     EhciTransfer->TransferParameters = TransferParameters;
     EhciTransfer->USBDStatus = USBD_STATUS_SUCCESS;
     EhciTransfer->EhciEndpoint = EhciEndpoint;
+    InitializeListHead(&EhciTransfer->ActiveITDs);
 
     DeviceSpeed = EhciEndpoint->EndpointProperties.DeviceSpeed;
 
@@ -2662,6 +2663,7 @@ EHCI_SubmitIsoTransfer(IN PVOID ehciExtension,
             return MP_STATUS_NO_RESOURCES;
         }
         DPRINT("OriginalFrame %u New FrameNumber %u\n", IsoTransfer->Packets[0].FrameNumber, CurrentFrame);
+        EHCI_DisablePeriodicList(EhciExtension);
 
         /* Allocate and program iTDs, one per frame */
         while (PacketIndex < IsoTransfer->TotalPackets)
@@ -2681,6 +2683,7 @@ EHCI_SubmitIsoTransfer(IN PVOID ehciExtension,
                 /* TODO: free previously allocated iTDs */
                 return MP_STATUS_NO_RESOURCES;
             }
+
             DPRINT("ITD %p CurrentFrame %x\n", ITD, CurrentFrame);
             EndpointProperties = &EhciEndpoint->EndpointProperties;
             DeviceAddress = EndpointProperties->DeviceAddress;
@@ -2707,7 +2710,10 @@ EHCI_SubmitIsoTransfer(IN PVOID ehciExtension,
             ITD->HwTD.Buffer[1].Direction = Direction;
 
             /* Setup buffer page 2 with multi (transactions per microframe) */
-            ITD->HwTD.Buffer[2].Multi = EndpointProperties->TransactionPerMicroframe;
+            ITD->HwTD.Buffer[2].Multi = IsoTransfer->Packets[PacketIndex].PacketLength / EndpointProperties->MaxPacketSize;
+            ASSERT(IsoTransfer->Packets[PacketIndex].PacketLength % EndpointProperties->MaxPacketSize == 0);
+            ASSERT(ITD->HwTD.Buffer[2].Multi > 0);
+            ASSERT(ITD->HwTD.Buffer[2].Multi <= 3);
 
             /* Program each packet into a transaction slot */
             for (p = 0; p < PacketsThisITD; p++)
@@ -2824,9 +2830,9 @@ EHCI_SubmitIsoTransfer(IN PVOID ehciExtension,
             PacketIndex += PacketsThisITD;
             CurrentFrame++;
             ITDCount++;
+            InsertTailList(&EhciTransfer->ActiveITDs, &ITD->ActiveITDEntry);
+            //DPRINT1("Submitted ITD %p at Frame %u\n", ITD, ITD->ScheduledFrame);
         }
-        ASSERT(EhciTransfer->ActiveITD == NULL);
-        EhciTransfer->ActiveITD = FirstITD;
         EhciEndpoint->FrameCount += ITDCount;
         EhciTransfer->PendingTDs += ITDCount;
         EhciExtension->PendingTransfers++;
@@ -2866,10 +2872,11 @@ EHCI_AbortIsoTransfer(IN PEHCI_EXTENSION EhciExtension,
         DPRINT("EHCI_AbortIsoTransfer: Aborting high-speed ISO transfer\n");
 
         /* Find iTDs belonging to this transfer and abort them */
-        while(EhciTransfer->ActiveITD)
+        while(!IsListEmpty(&EhciTransfer->ActiveITDs))
         {
             /* grab first */
-            ITD = EhciTransfer->ActiveITD;
+            PLIST_ENTRY Entry = RemoveHeadList(&EhciTransfer->ActiveITDs);
+            ITD = CONTAINING_RECORD(Entry, EHCI_HCD_ITD, ActiveITDEntry);
             /* Found an iTD for this transfer */
             DPRINT("EHCI_AbortIsoTransfer: Aborting iTD %p\n", ITD);
 
@@ -3909,8 +3916,9 @@ EHCI_PollIsoEndpoint(IN PEHCI_EXTENSION EhciExtension,
                 if (ITD->PacketLength[TransIdx] > 0)
                 {
                     HasProgrammedTransactions = TRUE;
-                    if (ITD->HwTD.Transaction[TransIdx].Status &
-                       (EHCI_TOKEN_STATUS_ACTIVE >> 4))
+
+                    ULONG Status = ITD->HwTD.Transaction[TransIdx].Status;
+                    if (Status & (1 << 3))
                     {
                         StillActive = TRUE;
                         break;
@@ -3940,6 +3948,7 @@ EHCI_PollEndpoint(IN PVOID ehciExtension,
 {
     PEHCI_EXTENSION EhciExtension = ehciExtension;
     PEHCI_ENDPOINT EhciEndpoint = ehciEndpoint;
+
     ULONG TransferType;
 
     //DPRINT_EHCI("EHCI_PollEndpoint: EhciEndpoint - %p\n", EhciEndpoint);
@@ -4427,6 +4436,10 @@ EHCI_ProcessCompletedITD(IN PEHCI_EXTENSION EhciExtension,
         ITD->TdFlags &= ~EHCI_HCD_ITD_FLAG_ALLOCATED;
         ITD->NextHcdTD = NULL;
         ITD->EhciTransfer = NULL;
+        ITD->EhciEndpoint = NULL;
+        for(ULONG Index = 0; Index < EHCI_MAX_ITD_TRANSACTIONS; Index++)
+            ITD->PacketLength[Index] = 0;
+
         EhciEndpoint->RemainITDs++;
 
         /* Update per-iTD count */
@@ -4436,10 +4449,10 @@ EHCI_ProcessCompletedITD(IN PEHCI_EXTENSION EhciExtension,
                ITD, TotalBytesTransferred, EhciTransfer->PendingTDs);
 
         /* Complete the transfer only when ALL iTDs are done */
-        if (EhciTransfer->ActiveITD == NULL)
+        if (IsListEmpty(&EhciTransfer->ActiveITDs))
         {
+            ASSERT(EhciTransfer->PendingTDs == 0);
             EhciExtension->PendingTransfers--;
-            ASSERT(EhciTransfer->ActiveITD == NULL);
             DPRINT("EHCI_ProcessCompletedITD: Transfer fully completed, %d total bytes\n",
                    EhciTransfer->TransferLen);
 
@@ -4462,7 +4475,7 @@ EHCI_UnlinkITDFromFrameList(IN PEHCI_EXTENSION EhciExtension,
     ULONG FrameIndex;
     ULONG TargetPhysicalAddress;
     EHCI_LINK_POINTER CurrentLink;
-    PEHCI_HCD_ITD PrevITD, CurrentITD;
+
 
     HcResourcesVA = EhciExtension->HcResourcesVA;
     FrameIndex = Frame % EHCI_FRAME_LIST_MAX_ENTRIES;
@@ -4481,29 +4494,7 @@ EHCI_UnlinkITDFromFrameList(IN PEHCI_EXTENSION EhciExtension,
         HcResourcesVA->PeriodicFrameList[FrameIndex] = ITD->HwTD.NextLink.AsULONG;
         DPRINT_EHCI("EHCI_UnlinkITDFromFrameList: Unlinked iTD from frame %d head\n", FrameIndex);
     }
-    PrevITD = NULL;
-    CurrentITD = EhciTransfer->ActiveITD;
-    do
-    {
-        ASSERT(CurrentITD->EhciTransfer == EhciTransfer);
-        if (CurrentITD == ITD)
-        {
-            /* unlink */
-            if (PrevITD)
-            {
-                PrevITD->NextHcdTD = CurrentITD->NextHcdTD;
-            }
-            else
-            {
-                EhciTransfer->ActiveITD = CurrentITD->NextHcdTD;
-            }
-            break;
-        }
-        PrevITD = CurrentITD;
-        CurrentITD = CurrentITD->NextHcdTD;
-    } while (CurrentITD != NULL);
-
-    ASSERT(CurrentITD == ITD);
+    RemoveEntryList(&ITD->ActiveITDEntry);
     RtlClearBits(&EhciExtension->IsoBitmap, ITD->ScheduledFrame, 1);
     ITD->NextHcdTD = NULL;
     ITD->EhciTransfer = NULL;

drivers/usb/usbehci/usbehci.h

@@ -107,12 +107,13 @@ typedef struct _EHCI_HCD_ITD {
   struct _EHCI_HCD_ITD * NextHcdTD;
   ULONG PacketLength[EHCI_MAX_ITD_TRANSACTIONS];
   ULONG PacketStatus[EHCI_MAX_ITD_TRANSACTIONS];
+  LIST_ENTRY ActiveITDEntry;
   LIST_ENTRY DoneLink;
   ULONG ScheduledFrame; /* Frame list index where this iTD was inserted */
 #ifdef _WIN64
-  ULONG Pad[23];
+  ULONG Pad[16];
 #else
-  ULONG Pad[41];
+  ULONG Pad[23];
 #endif
 } EHCI_HCD_ITD, *PEHCI_HCD_ITD;
 C_ASSERT(sizeof(EHCI_HCD_ITD) == ROUND_UP(sizeof(EHCI_HCD_ITD), 32));
@@ -223,7 +224,7 @@ typedef struct _EHCI_TRANSFER {
   ULONG USBDStatus;
   ULONG TransferLen;
   PEHCI_ENDPOINT EhciEndpoint;
-  PEHCI_HCD_ITD ActiveITD;
+  LIST_ENTRY ActiveITDs;
   ULONG PendingTDs;
   ULONG TransferOnAsyncList;
 } EHCI_TRANSFER, *PEHCI_TRANSFER;

drivers/usb/usbport/iso.c

@@ -60,8 +60,8 @@ USBPORT_InitializeIsoTransfer(PDEVICE_OBJECT FdoDevice,
     ULONG TotalPackets, Idx;
     ULONG Period;
     BOOLEAN IsHighSpeed;
-    //PUSBPORT_DEVICE_EXTENSION FdoExtension;
-    //PUSBPORT_REGISTRATION_PACKET Packet;
+    PUSBPORT_DEVICE_EXTENSION FdoExtension;
+    PUSBPORT_REGISTRATION_PACKET Packet;
 
     DPRINT("USBPORT_InitializeIsoTransfer: FdoDevice - %p, Urb - %p Irp - %p\n", FdoDevice, Urb, Transfer->Irp);
 
@@ -99,15 +99,13 @@ USBPORT_InitializeIsoTransfer(PDEVICE_OBJECT FdoDevice,
 
     IsoBlock->TotalPackets = TotalPackets;
     IsoBlock->MappedBuffer = (PVOID)SgTable->MappedSystemVa;
-#if 0
     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);
     }
-#endif
     /*
      * Walk each URB packet descriptor, compute its actual byte length
      * from the offset array, resolve the physical scatter/gather mapping,
@@ -274,7 +272,6 @@ USBPORT_CompleteIsoTransfer(IN PVOID MiniPortExtension,
             PacketLength = IsoUrb->TransferBufferLength - PacketDescriptor->Offset;
         }
 
-
         if (RemainingLength >= PacketLength)
         {
             PacketDescriptor->Status = USBD_STATUS_SUCCESS;
@@ -287,8 +284,11 @@ USBPORT_CompleteIsoTransfer(IN PVOID MiniPortExtension,
             PacketDescriptor->Status = USBD_STATUS_SUCCESS;
             PacketDescriptor->Length = RemainingLength;
             CompletedLength += RemainingLength;
-            RemainingLength = 0;
-            i++;
+            if (RemainingLength > 0)
+            {
+                RemainingLength = 0;
+                i++;
+            }
             break;
         }
     }while(i++ < IsoUrb->NumberOfPackets);

drivers/usb/usbport/urb.c

@@ -637,6 +637,33 @@ USBPORT_ValidateTransferParametersURB(IN PURB Urb)
 
     DPRINT_URB("USBPORT_ValidateTransferParametersURB: Urb - %p\n", Urb);
 
+    if (Urb->UrbHeader.Function == URB_FUNCTION_ISOCH_TRANSFER)
+    {
+            if (Urb->UrbIsochronousTransfer.TransferBuffer != NULL &&
+        Urb->UrbIsochronousTransfer.TransferBufferMDL == NULL &&
+        Urb->UrbIsochronousTransfer.TransferBufferLength != 0)
+        {
+            Mdl = IoAllocateMdl(Urb->UrbIsochronousTransfer.TransferBuffer,
+                            Urb->UrbIsochronousTransfer.TransferBufferLength,
+                            FALSE,
+                            FALSE,
+                            NULL);
+
+            if (!Mdl)
+            {
+                DPRINT1("USBPORT_ValidateTransferParametersURB: Not allocated Mdl\n");
+                return STATUS_INSUFFICIENT_RESOURCES;
+            }
+
+            MmBuildMdlForNonPagedPool(Mdl);
+
+            Urb->UrbIsochronousTransfer.TransferBufferMDL = Mdl;
+            Urb->UrbHeader.UsbdFlags |= USBD_FLAG_ALLOCATED_MDL;
+            return STATUS_SUCCESS;
+        }
+    }
+
+
     UrbRequest = &Urb->UrbControlTransfer;
 
     if (UrbRequest->TransferBuffer == NULL &&