Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 06:58:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBPORT] Add support for transaction translators in USBPORT_OpenPipe().

Browse source
This commit is contained in:
Vadim Galyant 2017-11-27 18:53:46 +09:00 committed by Amine Khaldi
parent e48d6136ec
commit 3fcbd7744c
2 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/usb/usbport/endpoint.c
View file

@ -672,6 +672,26 @@ USBPORT_OpenPipe(IN PDEVICE_OBJECT FdoDevice,
Endpoint->DeviceHandle = DeviceHandle; Endpoint->DeviceHandle = DeviceHandle;
Endpoint->LockCounter = -1; Endpoint->LockCounter = -1;
Endpoint->TtExtension = DeviceHandle->TtExtension;
if (DeviceHandle->TtExtension)
{
ExInterlockedInsertTailList(&DeviceHandle->TtExtension->TtList,
&Endpoint->TtLink,
&FdoExtension->TtSpinLock);
}
if (Packet->MiniPortFlags & USB_MINIPORT_FLAGS_USB2)
{
Endpoint->TtEndpoint = (PUSB2_TT_ENDPOINT)((ULONG_PTR)Endpoint +
sizeof(USBPORT_ENDPOINT) +
Packet->MiniPortEndpointSize);
}
else
{
Endpoint->TtEndpoint = NULL;
}
KeInitializeSpinLock(&Endpoint->EndpointSpinLock); KeInitializeSpinLock(&Endpoint->EndpointSpinLock);
KeInitializeSpinLock(&Endpoint->StateChangeSpinLock); KeInitializeSpinLock(&Endpoint->StateChangeSpinLock);
@ -695,6 +715,17 @@ USBPORT_OpenPipe(IN PDEVICE_OBJECT FdoDevice,
EndpointProperties->TotalMaxPacketSize = MaxPacketSize * EndpointProperties->TotalMaxPacketSize = MaxPacketSize *
(AdditionalTransaction + 1); (AdditionalTransaction + 1);
if (Endpoint->TtExtension)
{
EndpointProperties->HubAddr = Endpoint->TtExtension->DeviceAddress;
}
else
{
EndpointProperties->HubAddr = -1;
}
EndpointProperties->PortNumber = DeviceHandle->PortNumber;
switch (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) switch (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK)
{ {
case USB_ENDPOINT_TYPE_CONTROL: case USB_ENDPOINT_TYPE_CONTROL:
@ -960,6 +991,13 @@ ExitWithError:
} }
} }
if (Endpoint->TtExtension)
{
KeAcquireSpinLock(&FdoExtension->TtSpinLock, &OldIrql);
RemoveEntryList(&Endpoint->TtLink);
KeReleaseSpinLock(&FdoExtension->TtSpinLock, OldIrql);
}
ExFreePoolWithTag(Endpoint, USB_PORT_TAG); ExFreePoolWithTag(Endpoint, USB_PORT_TAG);
} }

11
drivers/usb/usbport/usbport.h
View file

@ -154,7 +154,9 @@ typedef struct _USBPORT_COMMON_BUFFER_HEADER {
typedef struct _USBPORT_ENDPOINT *PUSBPORT_ENDPOINT; typedef struct _USBPORT_ENDPOINT *PUSBPORT_ENDPOINT;
typedef struct _USB2_HC_EXTENSION *PUSB2_HC_EXTENSION; typedef struct _USB2_HC_EXTENSION *PUSB2_HC_EXTENSION;
typedef struct _USB2_TT_EXTENSION *PUSB2_TT_EXTENSION;
typedef struct _USB2_TT *PUSB2_TT; typedef struct _USB2_TT *PUSB2_TT;
typedef struct _USB2_TT_ENDPOINT *PUSB2_TT_ENDPOINT;
typedef struct _USBPORT_PIPE_HANDLE { typedef struct _USBPORT_PIPE_HANDLE {
ULONG Flags; ULONG Flags;
@ -194,6 +196,7 @@ typedef struct _USBPORT_DEVICE_HANDLE {
LIST_ENTRY DeviceHandleLink; LIST_ENTRY DeviceHandleLink;
LONG DeviceHandleLock; LONG DeviceHandleLock;
ULONG TtCount; ULONG TtCount;
PUSB2_TT_EXTENSION TtExtension; // Transaction Translator
LIST_ENTRY TtList; LIST_ENTRY TtList;
} USBPORT_DEVICE_HANDLE, *PUSBPORT_DEVICE_HANDLE; } USBPORT_DEVICE_HANDLE, *PUSBPORT_DEVICE_HANDLE;
@ -202,6 +205,8 @@ typedef struct _USBPORT_ENDPOINT {
PDEVICE_OBJECT FdoDevice; PDEVICE_OBJECT FdoDevice;
PUSBPORT_COMMON_BUFFER_HEADER HeaderBuffer; PUSBPORT_COMMON_BUFFER_HEADER HeaderBuffer;
PUSBPORT_DEVICE_HANDLE DeviceHandle; PUSBPORT_DEVICE_HANDLE DeviceHandle;
PUSB2_TT_EXTENSION TtExtension; // Transaction Translator
PUSB2_TT_ENDPOINT TtEndpoint;
USBPORT_ENDPOINT_PROPERTIES EndpointProperties; USBPORT_ENDPOINT_PROPERTIES EndpointProperties;
ULONG EndpointWorker; ULONG EndpointWorker;
ULONG FrameNumber; ULONG FrameNumber;
@ -230,6 +235,7 @@ typedef struct _USBPORT_ENDPOINT {
LIST_ENTRY FlushLink; LIST_ENTRY FlushLink;
LIST_ENTRY FlushControllerLink; LIST_ENTRY FlushControllerLink;
LIST_ENTRY FlushAbortLink; LIST_ENTRY FlushAbortLink;
LIST_ENTRY TtLink;
} USBPORT_ENDPOINT, *PUSBPORT_ENDPOINT; } USBPORT_ENDPOINT, *PUSBPORT_ENDPOINT;
typedef struct _USBPORT_ISO_BLOCK *PUSBPORT_ISO_BLOCK; typedef struct _USBPORT_ISO_BLOCK *PUSBPORT_ISO_BLOCK;
@ -381,10 +387,11 @@ typedef struct _USBPORT_DEVICE_EXTENSION {
/* Usb 2.0 HC Extension */ /* Usb 2.0 HC Extension */
PUSB2_HC_EXTENSION Usb2Extension; PUSB2_HC_EXTENSION Usb2Extension;
ULONG Bandwidth[32]; ULONG Bandwidth[32];
KSPIN_LOCK TtSpinLock;
/* Miniport extension should be aligned on 0x100 */ /* Miniport extension should be aligned on 0x100 */
#if !defined(_M_X64) #if !defined(_M_X64)
ULONG Padded[1]; ULONG Padded[64];
#else #else
ULONG Padded[0]; ULONG Padded[0];
#endif #endif
@ -392,7 +399,7 @@ typedef struct _USBPORT_DEVICE_EXTENSION {
} USBPORT_DEVICE_EXTENSION, *PUSBPORT_DEVICE_EXTENSION; } USBPORT_DEVICE_EXTENSION, *PUSBPORT_DEVICE_EXTENSION;
#if !defined(_M_X64) #if !defined(_M_X64)
C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x400); C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x500);
#else #else
C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x600); C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x600);
#endif #endif