Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

29/77: [USBPORT] Add USB2_IncMicroFrame().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71a7208f693ff9af09cc3… commit 71a7208f693ff9af09cc3852ac4baed5a903e055 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Fri Dec 1 10:13:10 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:44 2018 +0100 [USBPORT] Add USB2_IncMicroFrame(). --- drivers/usb/usbport/usb2.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index b70ac11851..d8d5da9af1 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -38,6 +38,20 @@ USB2_AddDataBitStuff(IN USHORT DataTime) return (DataTime + (DataTime / 16)); } +VOID +NTAPI +USB2_IncMicroFrame(OUT PUCHAR frame, + OUT PUCHAR uframe) +{ + ++*uframe; + + if (*uframe > (USB2_MICROFRAMES - 1)) + { + *uframe = 0; + *frame = (*frame + 1) & (USB2_FRAMES - 1); + } +} + BOOLEAN NTAPI USB2_CheckTtEndpointInsert(IN PUSB2_TT_ENDPOINT nextTtEndpoint,

1 0

28/77: [USBPORT] Add USB2_GetStartTime().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22b8777f8498a0bfa657a… commit 22b8777f8498a0bfa657af86ef3c08bbc4a414d9 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Thu Nov 30 00:11:48 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:44 2018 +0100 [USBPORT] Add USB2_GetStartTime(). --- drivers/usb/usbport/usb2.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 94c2844bd7..b70ac11851 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -159,6 +159,49 @@ USB2_GetLastIsoTime(IN PUSB2_TT_ENDPOINT TtEndpoint, return Result; } +ULONG +NTAPI +USB2_GetStartTime(IN PUSB2_TT_ENDPOINT nextTtEndpoint, + IN PUSB2_TT_ENDPOINT TtEndpoint, + IN PUSB2_TT_ENDPOINT prevTtEndpoint, + IN ULONG Frame) +{ + PUSB2_TT_ENDPOINT ttEndpoint; + ULONG TransferType; + + DPRINT("USB2_GetStartTime: nextTtEndpoint - %p, TtEndpoint - %p, prevTtEndpoint - %p, Frame - %X\n", + nextTtEndpoint, + TtEndpoint, + prevTtEndpoint, + Frame); + + TransferType = TtEndpoint->TtEndpointParams.TransferType; + + if (nextTtEndpoint && TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS) + { + return nextTtEndpoint->StartTime + nextTtEndpoint->CalcBusTime; + } + + if (TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS) + { + ttEndpoint = TtEndpoint->Tt->FrameBudget[Frame].AltEndpoint; + + if (ttEndpoint) + return ttEndpoint->StartTime + ttEndpoint->CalcBusTime; + else + return USB2_FS_SOF_TIME; + } + else + { + ttEndpoint = prevTtEndpoint; + + if (ttEndpoint == TtEndpoint->Tt->FrameBudget[Frame].IntEndpoint) + return USB2_GetLastIsoTime(TtEndpoint, Frame); + else + return ttEndpoint->StartTime + ttEndpoint->CalcBusTime; + } +} + VOID NTAPI USB2_InitTtEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint,

1 0

27/77: [USBPORT] Add USB2_GetLastIsoTime().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0216b033ccdd886d10395… commit 0216b033ccdd886d10395279766a87907e830881 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 23:50:26 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:44 2018 +0100 [USBPORT] Add USB2_GetLastIsoTime(). --- drivers/usb/usbport/usb2.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index ad8375db20..94c2844bd7 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -132,6 +132,33 @@ USB2_GetOverhead(IN PUSB2_TT_ENDPOINT TtEndpoint) return Overhead; } +ULONG +NTAPI +USB2_GetLastIsoTime(IN PUSB2_TT_ENDPOINT TtEndpoint, + IN ULONG Frame) +{ + PUSB2_TT_ENDPOINT nextTtEndpoint; + ULONG Result; + + DPRINT("USB2_GetLastIsoTime: TtEndpoint - %p, Frame - %X\n", + TtEndpoint, + Frame); + + nextTtEndpoint = TtEndpoint->Tt->FrameBudget[Frame].IsoEndpoint->NextTtEndpoint; + + if (nextTtEndpoint || + (nextTtEndpoint = TtEndpoint->Tt->FrameBudget[Frame].AltEndpoint) != NULL) + { + Result = nextTtEndpoint->StartTime + nextTtEndpoint->CalcBusTime; + } + else + { + Result = USB2_FS_SOF_TIME; + } + + return Result; +} + VOID NTAPI USB2_InitTtEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint,

1 0

26/77: [USBPORT] Add USB2_CheckTtEndpointInsert().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3803bed8a31f9ac138b1… commit c3803bed8a31f9ac138b1625d5c86187676d7bca Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 23:25:12 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:43 2018 +0100 [USBPORT] Add USB2_CheckTtEndpointInsert(). --- drivers/usb/usbport/usb2.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 080d48cf21..ad8375db20 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -38,6 +38,52 @@ USB2_AddDataBitStuff(IN USHORT DataTime) return (DataTime + (DataTime / 16)); } +BOOLEAN +NTAPI +USB2_CheckTtEndpointInsert(IN PUSB2_TT_ENDPOINT nextTtEndpoint, + IN PUSB2_TT_ENDPOINT TtEndpoint) +{ + ULONG TransferType; + + DPRINT("USB2_CheckTtEndpointInsert: nextTtEndpoint - %p, TtEndpoint - %p\n", + nextTtEndpoint, + TtEndpoint); + + ASSERT(TtEndpoint); + + if (TtEndpoint->CalcBusTime >= (USB2_FS_MAX_PERIODIC_ALLOCATION / 2)) + { + DPRINT1("USB2_CheckTtEndpointInsert: Result - FALSE\n"); + return FALSE; + } + + if (!nextTtEndpoint) + { + DPRINT("USB2_CheckTtEndpointInsert: Result - TRUE\n"); + return TRUE; + } + + TransferType = TtEndpoint->TtEndpointParams.TransferType; + + if (nextTtEndpoint->ActualPeriod < TtEndpoint->ActualPeriod && + TransferType == USBPORT_TRANSFER_TYPE_INTERRUPT) + { + DPRINT("USB2_CheckTtEndpointInsert: Result - TRUE\n"); + return TRUE; + } + + if ((nextTtEndpoint->ActualPeriod <= TtEndpoint->ActualPeriod && + TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS) || + nextTtEndpoint == TtEndpoint) + { + DPRINT("USB2_CheckTtEndpointInsert: Result - TRUE\n"); + return TRUE; + } + + DPRINT("USB2_CheckTtEndpointInsert: Result - FALSE\n"); + return FALSE; +} + ULONG NTAPI USB2_GetOverhead(IN PUSB2_TT_ENDPOINT TtEndpoint)

1 0

25/77: [USBPORT] Add USB2_AllocateCheck().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e701da4923f0ba5061d67… commit e701da4923f0ba5061d67649219771d8510d91d0 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 22:33:35 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:43 2018 +0100 [USBPORT] Add USB2_AllocateCheck(). --- drivers/usb/usbport/usb2.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index ace40d1e1c..080d48cf21 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -10,6 +10,27 @@ //#define NDEBUG #include <debug.h> +BOOLEAN +NTAPI +USB2_AllocateCheck(IN OUT PULONG OutTimeUsed, + IN ULONG CalcBusTime, + IN ULONG LimitAllocation) +{ + ULONG BusTime; + BOOLEAN Result = TRUE; + + BusTime = *OutTimeUsed + CalcBusTime; + *OutTimeUsed += CalcBusTime; + + if (BusTime > LimitAllocation) + { + DPRINT("USB2_AllocateCheck: BusTime > LimitAllocation\n"); + Result = FALSE; + } + + return Result; +} + USHORT NTAPI USB2_AddDataBitStuff(IN USHORT DataTime)

1 0

24/77: [USBPORT] Add USB2_AddDataBitStuff().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c034297f2d4e0bd0f3788… commit c034297f2d4e0bd0f378899e163ee1debbdef544 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 22:21:58 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:43 2018 +0100 [USBPORT] Add USB2_AddDataBitStuff(). --- drivers/usb/usbport/usb2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 3755fb4e80..ace40d1e1c 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -10,6 +10,13 @@ //#define NDEBUG #include <debug.h> +USHORT +NTAPI +USB2_AddDataBitStuff(IN USHORT DataTime) +{ + return (DataTime + (DataTime / 16)); +} + ULONG NTAPI USB2_GetOverhead(IN PUSB2_TT_ENDPOINT TtEndpoint)

1 0

23/77: [USBPORT] Add USB2_GetOverhead().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=754f749cfd5ec4b406592… commit 754f749cfd5ec4b40659293eb3d5d7ac96dbbdea Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 21:50:43 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:42 2018 +0100 [USBPORT] Add USB2_GetOverhead(). --- drivers/usb/usbport/usb2.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 11429ec108..3755fb4e80 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -10,6 +10,54 @@ //#define NDEBUG #include <debug.h> +ULONG +NTAPI +USB2_GetOverhead(IN PUSB2_TT_ENDPOINT TtEndpoint) +{ + ULONG TransferType; + ULONG Direction; + ULONG DeviceSpeed; + ULONG Overhead; + ULONG HostDelay; + + TransferType = TtEndpoint->TtEndpointParams.TransferType; + Direction = TtEndpoint->TtEndpointParams.Direction; + DeviceSpeed = TtEndpoint->TtEndpointParams.Direction; + + HostDelay = TtEndpoint->Tt->HcExtension->HcDelayTime; + + if (DeviceSpeed == UsbHighSpeed) + { + if (Direction == USBPORT_TRANSFER_DIRECTION_OUT) + { + if (TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS) + Overhead = HostDelay + USB2_HS_ISOCHRONOUS_OUT_OVERHEAD; + else + Overhead = HostDelay + USB2_HS_INTERRUPT_OUT_OVERHEAD; + } + else + { + if (TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS) + Overhead = HostDelay + USB2_HS_ISOCHRONOUS_IN_OVERHEAD; + else + Overhead = HostDelay + USB2_HS_ISOCHRONOUS_OUT_OVERHEAD; + } + } + else if (DeviceSpeed == UsbFullSpeed) + { + if (TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS) + Overhead = HostDelay + USB2_FS_ISOCHRONOUS_OVERHEAD; + else + Overhead = HostDelay + USB2_FS_INTERRUPT_OVERHEAD; + } + else + { + Overhead = HostDelay + USB2_LS_INTERRUPT_OVERHEAD; + } + + return Overhead; +} + VOID NTAPI USB2_InitTtEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint,

1 0

22/77: [USBPORT] Start implementation USBPORT_AllocateBandwidthUSB2().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2ae849dab4689fcff2db… commit c2ae849dab4689fcff2db3ea98d5ddc5ac954cef Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 06:54:22 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:42 2018 +0100 [USBPORT] Start implementation USBPORT_AllocateBandwidthUSB2(). --- drivers/usb/usbport/endpoint.c | 4 +- drivers/usb/usbport/usb2.c | 210 ++++++++++++++++++++++++++++++++++++++++- drivers/usb/usbport/usbport.h | 5 + 3 files changed, 215 insertions(+), 4 deletions(-) diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index 23bccb14c3..8633d9be8f 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -105,7 +105,7 @@ USBPORT_AllocateBandwidth(IN PDEVICE_OBJECT FdoDevice, MinBandwidth = TotalBusBandwidth; Bandwidth = &FdoExtension->Bandwidth[Offset * Factor]; - for (ix = 0; *Bandwidth >= EndpointBandwidth; ix++) + for (ix = 1; *Bandwidth >= EndpointBandwidth; ix++) { if (MinBandwidth > *Bandwidth) { @@ -114,7 +114,7 @@ USBPORT_AllocateBandwidth(IN PDEVICE_OBJECT FdoDevice, Bandwidth++; - if (Factor <= (ix + 1)) + if (Factor <= ix) { if (MinBandwidth > MaxBandwidth) { diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 2e511b5d9a..11429ec108 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -31,6 +31,28 @@ USB2_InitTtEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint, TtEndpoint->Tt = Tt; } +BOOLEAN +NTAPI +USB2_AllocateTimeForEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint, + IN PUSB2_REBALANCE Rebalance, + IN PULONG RebalanceListEntries) +{ + DPRINT("USB2_AllocateTimeForEndpoint: UNIMPLEMENTED. FIXME\n"); + ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +NTAPI +USB2_PromotePeriods(IN PUSB2_TT_ENDPOINT TtEndpoint, + IN PUSB2_REBALANCE Rebalance, + IN PULONG RebalanceListEntries) +{ + DPRINT1("USB2_PromotePeriods: UNIMPLEMENTED. FIXME\n"); + ASSERT(FALSE); + return FALSE; +} + VOID NTAPI USBPORT_UpdateAllocatedBwTt(IN PUSB2_TT_EXTENSION TtExtension) @@ -70,8 +92,192 @@ NTAPI USBPORT_AllocateBandwidthUSB2(IN PDEVICE_OBJECT FdoDevice, IN PUSBPORT_ENDPOINT Endpoint) { - DPRINT1("USBPORT_AllocateBandwidthUSB2: UNIMPLEMENTED. FIXME. \n"); - return TRUE; + PUSBPORT_DEVICE_EXTENSION FdoExtension; + PUSBPORT_ENDPOINT_PROPERTIES EndpointProperties; + PUSB2_TT_EXTENSION TtExtension; + ULONG TransferType; + PUSB2_REBALANCE Rebalance; + LIST_ENTRY RebalanceList; + ULONG RebalanceListEntries; + PUSB2_TT_ENDPOINT TtEndpoint; + PUSB2_TT_ENDPOINT RebalanceTtEndpoint; + + PUSB2_TT Tt; + USB_DEVICE_SPEED DeviceSpeed; + ULONG Period; + + ULONG ix; + BOOLEAN Direction; + BOOLEAN Result; + + DPRINT("USBPORT_AllocateBandwidthUSB2: FdoDevice - %p, Endpoint - %p\n", + FdoDevice, + Endpoint); + + EndpointProperties = &Endpoint->EndpointProperties; + EndpointProperties->ScheduleOffset = 0; + + if (Endpoint->Flags & ENDPOINT_FLAG_ROOTHUB_EP0) + { + DPRINT("USBPORT_AllocateBandwidthUSB2: ENDPOINT_FLAG_ROOTHUB_EP0\n"); + return TRUE; + } + + FdoExtension = FdoDevice->DeviceExtension; + + TransferType = EndpointProperties->TransferType; + DPRINT("USBPORT_AllocateBandwidthUSB2: TransferType - %X\n", TransferType); + + if (TransferType == USBPORT_TRANSFER_TYPE_CONTROL || + TransferType == USBPORT_TRANSFER_TYPE_BULK) + { + return TRUE; + } + + if (Endpoint->TtExtension) + TtExtension = Endpoint->TtExtension; + else + TtExtension = NULL; + + InitializeListHead(&RebalanceList); + + Rebalance = ExAllocatePoolWithTag(NonPagedPool, + sizeof(USB2_REBALANCE), + USB_PORT_TAG); + + DPRINT("USBPORT_AllocateBandwidthUSB2: Rebalance - %p, TtExtension - %p\n", + Rebalance, + TtExtension); + + if (Rebalance) + { + RtlZeroMemory(Rebalance, sizeof(USB2_REBALANCE)); + + TtEndpoint = Endpoint->TtEndpoint; + TtEndpoint->Endpoint = Endpoint; + + Direction = EndpointProperties->Direction == USBPORT_TRANSFER_DIRECTION_OUT; + DeviceSpeed = EndpointProperties->DeviceSpeed; + + switch (DeviceSpeed) + { + case UsbLowSpeed: + case UsbFullSpeed: + { + Tt = &TtExtension->Tt; + Period = USB2_FRAMES; + + while (Period && Period > EndpointProperties->Period); + { + Period >>= 1; + } + + DPRINT("USBPORT_AllocateBandwidthUSB2: Period - %X\n", Period); + break; + } + + case UsbHighSpeed: + { + Tt = &FdoExtension->Usb2Extension->HcTt; + Period = EndpointProperties->Period; + + if (EndpointProperties->Period > USB2_MAX_MICROFRAMES) + Period = USB2_MAX_MICROFRAMES; + + break; + } + + default: + { + DPRINT1("USBPORT_AllocateBandwidthUSB2: DeviceSpeed - %X!\n", DeviceSpeed); + DbgBreakPoint(); + Tt = &TtExtension->Tt; + break; + } + } + + USB2_InitTtEndpoint(TtEndpoint, + TransferType, + Direction, + DeviceSpeed, + Period, + EndpointProperties->MaxPacketSize, + Tt); + + RebalanceListEntries = USB2_FRAMES - 2; + + Result = USB2_AllocateTimeForEndpoint(TtEndpoint, + Rebalance, + &RebalanceListEntries); + + if (Result) + { + Result = USB2_PromotePeriods(TtEndpoint, + Rebalance, + &RebalanceListEntries); + } + + RebalanceListEntries = 0; + + for (ix = 0; Rebalance->RebalanceEndpoint[ix]; ix++) + { + RebalanceListEntries = ix + 1; + } + } + else + { + RebalanceListEntries = 0; + Result = FALSE; + } + + DPRINT("USBPORT_AllocateBandwidthUSB2: RebalanceListEntries - %X, Result - %X\n", + RebalanceListEntries, + Result); + + for (ix = 0; ix < RebalanceListEntries; ix++) + { + DPRINT("USBPORT_AllocateBandwidthUSB2: RebalanceEndpoint[%X] - %X\n", + ix, + Rebalance->RebalanceEndpoint[ix]); + + RebalanceTtEndpoint = Rebalance->RebalanceEndpoint[ix]; + + InsertTailList(&RebalanceList, + &RebalanceTtEndpoint->Endpoint->RebalanceLink); + } + + if (Rebalance) + ExFreePool(Rebalance); + + if (Result) + { + DPRINT1("USBPORT_AllocateBandwidthUSB2: UNIMPLEMENTED. FIXME. \n"); + ASSERT(FALSE); + } + + //USB2_Rebalance(FdoDevice, &RebalanceList); + + if (!TtExtension) + { + DPRINT("USBPORT_AllocateBandwidthUSB2: Result - %X\n", Result); + return Result; + } + + for (ix = 0; ix < USB2_FRAMES; ix++) + { + FdoExtension->Bandwidth[ix] += TtExtension->MaxBandwidth; + } + + USBPORT_UpdateAllocatedBwTt(TtExtension); + + for (ix = 0; ix < USB2_FRAMES; ix++) + { + FdoExtension->Bandwidth[ix] -= TtExtension->MaxBandwidth; + } + + DPRINT("USBPORT_AllocateBandwidthUSB2: Result - %X\n", Result); + + return Result; } VOID diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h index 940c944c48..bb68680216 100644 --- a/drivers/usb/usbport/usbport.h +++ b/drivers/usb/usbport/usbport.h @@ -236,6 +236,7 @@ typedef struct _USBPORT_ENDPOINT { LIST_ENTRY FlushControllerLink; LIST_ENTRY FlushAbortLink; LIST_ENTRY TtLink; + LIST_ENTRY RebalanceLink; } USBPORT_ENDPOINT, *PUSBPORT_ENDPOINT; typedef struct _USBPORT_ISO_BLOCK *PUSBPORT_ISO_BLOCK; @@ -551,6 +552,10 @@ typedef struct _USB2_HC_EXTENSION { USB2_TT HcTt; } USB2_HC_EXTENSION, *PUSB2_HC_EXTENSION; +typedef struct _USB2_REBALANCE { + PUSB2_TT_ENDPOINT RebalanceEndpoint[USB2_FRAMES - 2]; +} USB2_REBALANCE, *PUSB2_REBALANCE; + /* usbport.c */ NTSTATUS NTAPI

1 0

21/77: [USBPORT] Change debug message in USBPORT_RemoveDevice(().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02d1cfd37f15c3fbec8a5… commit 02d1cfd37f15c3fbec8a54eb11a56b25a544da2b Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 03:51:25 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:41 2018 +0100 [USBPORT] Change debug message in USBPORT_RemoveDevice((). --- drivers/usb/usbport/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index ec6dbc33b3..7ea2fda5ca 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -1626,7 +1626,10 @@ USBPORT_RemoveDevice(IN PDEVICE_OBJECT FdoDevice, USBPORT_FreeUsbAddress(FdoDevice, DeviceHandle->DeviceAddress); } - DPRINT("USBPORT_RemoveDevice: DeviceHandle->TtList.Flink - %p\n", DeviceHandle->TtList.Flink); + if (!IsListEmpty(&DeviceHandle->TtList)) + { + DPRINT1("USBPORT_RemoveDevice: DeviceHandle->TtList not empty\n"); + } while (!IsListEmpty(&DeviceHandle->TtList)) {

1 0

20/77: [USBPORT] Add support for transaction translators in USBPORT_RemoveDevice().
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e15ba48b9ea8460a0929… commit 5e15ba48b9ea8460a0929e4c2092c3137b1d811d Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Nov 29 03:30:46 2017 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:41 2018 +0100 [USBPORT] Add support for transaction translators in USBPORT_RemoveDevice(). --- drivers/usb/usbport/device.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index 7ba54f594e..ec6dbc33b3 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -1564,6 +1564,9 @@ USBPORT_RemoveDevice(IN PDEVICE_OBJECT FdoDevice, IN ULONG Flags) { PUSBPORT_DEVICE_EXTENSION FdoExtension; + PUSB2_TT_EXTENSION TtExtension; + ULONG ix; + KIRQL OldIrql; DPRINT("USBPORT_RemoveDevice: DeviceHandle - %p, Flags - %x\n", DeviceHandle, @@ -1623,6 +1626,37 @@ USBPORT_RemoveDevice(IN PDEVICE_OBJECT FdoDevice, USBPORT_FreeUsbAddress(FdoDevice, DeviceHandle->DeviceAddress); } + DPRINT("USBPORT_RemoveDevice: DeviceHandle->TtList.Flink - %p\n", DeviceHandle->TtList.Flink); + + while (!IsListEmpty(&DeviceHandle->TtList)) + { + TtExtension = CONTAINING_RECORD(DeviceHandle->TtList.Flink, + USB2_TT_EXTENSION, + Link); + + RemoveHeadList(&DeviceHandle->TtList); + + DPRINT("USBPORT_RemoveDevice: TtExtension - %p\n", TtExtension); + + KeAcquireSpinLock(&FdoExtension->TtSpinLock, &OldIrql); + + TtExtension->Flags |= USB2_TT_EXTENSION_FLAG_DELETED; + + if (IsListEmpty(&TtExtension->EndpointList)) + { + USBPORT_UpdateAllocatedBwTt(TtExtension); + + for (ix = 0; ix < USB2_FRAMES; ix++) + { + FdoExtension->Bandwidth[ix] += TtExtension->MaxBandwidth; + } + + ExFreePool(TtExtension); + } + + KeReleaseSpinLock(&FdoExtension->TtSpinLock, OldIrql); + } + KeReleaseSemaphore(&FdoExtension->DeviceSemaphore, LOW_REALTIME_PRIORITY, 1,

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
44
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2018