Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [CMAKE] Remove some anachronisms.
by Thomas Faber 30 Mar '18

30 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d96609a4397c89a01f786… commit d96609a4397c89a01f7868e6615c9751486bde65 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 10 14:38:58 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Mar 30 18:52:14 2018 +0200 [CMAKE] Remove some anachronisms. --- CMakeLists.txt | 10 ---------- sdk/cmake/CMakeMacros.cmake | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcf4c18d30..f752a8eb18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,16 +138,6 @@ else() #useful stuff! include(CMakeParseArguments) - # Do some cleanup - file(REMOVE - ${REACTOS_BINARY_DIR}/dependencies.graphml - ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt - ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt - ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt - ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt - ${REACTOS_BINARY_DIR}/boot/ros_cab.txt - ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) - if(NOT NEW_STYLE_BUILD) if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 597143838b..89ef310f23 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -99,7 +99,7 @@ function(add_dependency_edge _source _target) endfunction() function(add_dependency_header) - file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<graphml>\n <graph id=\"ReactOS dependencies\" edgedefault=\"directed\">\n") + file(WRITE ${REACTOS_BINARY_DIR}/dependencies.graphml "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<graphml>\n <graph id=\"ReactOS dependencies\" edgedefault=\"directed\">\n") endfunction() function(add_dependency_footer)

1 0

01/01: [INETCPL] Italian translation update (#453)
by Bișoc George 30 Mar '18

30 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9703ae9a08d81e2e9be60… commit 9703ae9a08d81e2e9be603b129753b48b1dbd51e Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Mar 30 15:19:26 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri Mar 30 15:19:26 2018 +0200 [INETCPL] Italian translation update (#453) --- dll/cpl/inetcpl/lang/it-IT.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/cpl/inetcpl/lang/it-IT.rc b/dll/cpl/inetcpl/lang/it-IT.rc index ed0c3fe660..462116c3ab 100644 --- a/dll/cpl/inetcpl/lang/it-IT.rc +++ b/dll/cpl/inetcpl/lang/it-IT.rc @@ -65,21 +65,21 @@ END IDD_DELETE_HISTORY DIALOGEX 0, 0, 250, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Delete browsing history" +CAPTION "Cancella Cronologia" BEGIN - AUTOCHECKBOX "Temporary internet files\nCached copies of web pages, images and certificates.", + AUTOCHECKBOX "File internet temporanei\nCopie di pagine web, immagini e certificati.", IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Cookies\nFiles saved on your computer by websites, which store things like user preferences and login information.", + AUTOCHECKBOX "I Cookie\nFile salvate nel tuo computer dai siti web, che contengono dati come le preferenze dell'utente e altri informazioni.", IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "History\nList of websites you have accessed.", + AUTOCHECKBOX "Storia\nLista di siti web che hai visitato.", IDC_DELETE_HISTORY, 10, 88, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Form data\nUsernames and other information you have entered into forms.", + AUTOCHECKBOX "Dati inseriti\nNome utente e altri informazioni che hai inserito.", IDC_DELETE_FORM_DATA, 10, 128, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Passwords\nSaved passwords you have entered into forms.", + AUTOCHECKBOX "Password\nLe password salvate che hai inserito.", IDC_DELETE_PASSWORDS, 10, 168, 230, 40, BS_TOP | BS_MULTILINE - DEFPUSHBUTTON "Cancel", IDCANCEL, 185, 230, 60, 15, WS_GROUP - PUSHBUTTON "Delete", IDOK, 120, 230, 60, 15, WS_GROUP + DEFPUSHBUTTON "Annulla", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "Cancella", IDOK, 120, 230, 60, 15, WS_GROUP END @@ -87,7 +87,7 @@ END IDD_SECURITY DIALOGEX 0, 0, 320, 220 STYLE DS_SHELLFONT | WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Security" +CAPTION "Sicurezza" BEGIN CONTROL "", IDC_SEC_LISTVIEW, "SysListView32",

1 0

77/77: Merge PR #283 "[USBPORT] Transaction Translator (TT) support bringup"
by Colin Finck 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=765280bf5f7ba16f1c933… commit 765280bf5f7ba16f1c9333a5a96e571d45a1d33a Merge: 851a554b59 62612a7e45 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Thu Mar 29 23:52:22 2018 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Thu Mar 29 23:52:22 2018 +0200 Merge PR #283 "[USBPORT] Transaction Translator (TT) support bringup" drivers/usb/usbport/debug.c | 37 + drivers/usb/usbport/device.c | 227 +++- drivers/usb/usbport/endpoint.c | 270 ++++- drivers/usb/usbport/ioctl.c | 10 +- drivers/usb/usbport/pnp.c | 8 + drivers/usb/usbport/power.c | 2 - drivers/usb/usbport/trfsplit.c | 6 +- drivers/usb/usbport/usb2.c | 2222 +++++++++++++++++++++++++++++++++++++++- drivers/usb/usbport/usbdebug.h | 19 + drivers/usb/usbport/usbport.c | 27 +- drivers/usb/usbport/usbport.h | 171 +++- sdk/include/psdk/usb200.h | 8 + 12 files changed, 2941 insertions(+), 66 deletions(-)

1 0

76/77: [USBPORT] Use USB2_HS_INTERRUPT_IN_OVERHEAD instead USB2_HS_ISOCHRONOUS_OUT_OVERHEAD.
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62612a7e45fa2bdfa254c… commit 62612a7e45fa2bdfa254cf9eaf2bd81634f4d4ee Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Feb 21 13:35:25 2018 +0900 Commit: Vadim Galyant <vgal(a)rambler.ru> CommitDate: Wed Feb 21 13:35:25 2018 +0900 [USBPORT] Use USB2_HS_INTERRUPT_IN_OVERHEAD instead USB2_HS_ISOCHRONOUS_OUT_OVERHEAD. --- drivers/usb/usbport/usb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 7d2c9a308d..be13000112 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -145,7 +145,7 @@ USB2_GetOverhead(IN PUSB2_TT_ENDPOINT TtEndpoint) if (TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS) Overhead = HostDelay + USB2_HS_ISOCHRONOUS_IN_OVERHEAD; else - Overhead = HostDelay + USB2_HS_ISOCHRONOUS_OUT_OVERHEAD; + Overhead = HostDelay + USB2_HS_INTERRUPT_IN_OVERHEAD; } } else if (DeviceSpeed == UsbFullSpeed)

1 0

75/77: [USBPORT] Small changes for debugging.
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11772da783546c032b039… commit 11772da783546c032b0393818747154d23fb6bae Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Fri Jan 26 20:46:34 2018 +0900 Commit: Vadim Galyant <vgal(a)rambler.ru> CommitDate: Fri Jan 26 20:46:34 2018 +0900 [USBPORT] Small changes for debugging. --- drivers/usb/usbport/device.c | 2 +- drivers/usb/usbport/endpoint.c | 2 +- drivers/usb/usbport/ioctl.c | 2 +- drivers/usb/usbport/power.c | 2 -- drivers/usb/usbport/usbport.c | 8 ++++---- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index 43ec4a58dc..070a6c9816 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -7,7 +7,7 @@ #include "usbport.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> NTSTATUS diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index 56ad3411b2..0386bd0f14 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -1279,7 +1279,7 @@ USBPORT_FlushClosedEndpointList(IN PDEVICE_OBJECT FdoDevice) PLIST_ENTRY ClosedList; PUSBPORT_ENDPOINT Endpoint; - DPRINT("USBPORT_FlushClosedEndpointList: ... \n"); + DPRINT_CORE("USBPORT_FlushClosedEndpointList: ... \n"); FdoExtension = FdoDevice->DeviceExtension; diff --git a/drivers/usb/usbport/ioctl.c b/drivers/usb/usbport/ioctl.c index 6502c6549a..7e29d3d618 100644 --- a/drivers/usb/usbport/ioctl.c +++ b/drivers/usb/usbport/ioctl.c @@ -7,7 +7,7 @@ #include "usbport.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> VOID diff --git a/drivers/usb/usbport/power.c b/drivers/usb/usbport/power.c index 56f150d8dd..0dca45334d 100644 --- a/drivers/usb/usbport/power.c +++ b/drivers/usb/usbport/power.c @@ -105,8 +105,6 @@ USBPORT_DoSetPowerD0(IN PDEVICE_OBJECT FdoDevice) { DPRINT("USBPORT_DoSetPowerD0: FIXME!\n"); return; - DbgBreakPoint(); - //ASSERT(FALSE); } VOID diff --git a/drivers/usb/usbport/usbport.c b/drivers/usb/usbport/usbport.c index 3be8e951ef..cc85e73bca 100644 --- a/drivers/usb/usbport/usbport.c +++ b/drivers/usb/usbport/usbport.c @@ -637,8 +637,8 @@ USBPORT_InvalidateControllerHandler(IN PDEVICE_OBJECT FdoDevice, { PUSBPORT_DEVICE_EXTENSION FdoExtension; - DPRINT("USBPORT_InvalidateControllerHandler: Invalidate Type - %x\n", - Type); + DPRINT_CORE("USBPORT_InvalidateControllerHandler: Invalidate Type - %x\n", + Type); FdoExtension = FdoDevice->DeviceExtension; @@ -869,7 +869,7 @@ USBPORT_DpcHandler(IN PDEVICE_OBJECT FdoDevice) LIST_ENTRY List; LONG LockCounter; - DPRINT("USBPORT_DpcHandler: ... \n"); + DPRINT_CORE("USBPORT_DpcHandler: ... \n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1953,7 +1953,7 @@ USBPORT_Unload(IN PDRIVER_OBJECT DriverObject) if (!MiniPortInterface) { - DPRINT("USBPORT_Unload: CRITICAL ERROR!!! USBPORT_FindMiniPort not found MiniPortInterface\n"); + DPRINT("USBPORT_Unload: CRITICAL ERROR!!! Not found MiniPortInterface\n"); KeBugCheckEx(BUGCODE_USB_DRIVER, 1, 0, 0, 0); }

1 0

74/77: [USBPORT] Add USB2_BIT_STUFFING_OVERHEAD constant.
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f37a3dc42fb08d7c4ebde… commit f37a3dc42fb08d7c4ebdeefb8c369b6c2f21a2e4 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Mon Jan 22 14:15:57 2018 +0900 Commit: Vadim Galyant <vgal(a)rambler.ru> CommitDate: Mon Jan 22 14:15:57 2018 +0900 [USBPORT] Add USB2_BIT_STUFFING_OVERHEAD constant. --- drivers/usb/usbport/endpoint.c | 2 +- drivers/usb/usbport/usbport.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index 2e9881bff2..56ad3411b2 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -47,7 +47,7 @@ USBPORT_CalculateUsbBandwidth(IN PDEVICE_OBJECT FdoDevice, } else { - Bandwidth = (EndpointProperties->TotalMaxPacketSize + Overhead) * 8 * 7 / 6; + Bandwidth = (EndpointProperties->TotalMaxPacketSize + Overhead) * USB2_BIT_STUFFING_OVERHEAD; } if (EndpointProperties->DeviceSpeed == UsbLowSpeed) diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h index 55c97e5330..20386f4845 100644 --- a/drivers/usb/usbport/usbport.h +++ b/drivers/usb/usbport/usbport.h @@ -479,6 +479,8 @@ typedef struct _TIMER_WORK_QUEUE_ITEM { #define USB2_HS_SS_ISOCHRONOUS_IN_OVERHEAD 39 #define USB2_HS_CS_ISOCHRONOUS_IN_OVERHEAD 38 +#define USB2_BIT_STUFFING_OVERHEAD (8 * (7/6)) // 7.1.9 Bit Stuffing + typedef union _USB2_TT_ENDPOINT_PARAMS { struct { ULONG TransferType : 4;

1 0

73/77: [USBPORT] Fixing use DeviceSpeed instead Direction.
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=797ebcab724adf1616cba… commit 797ebcab724adf1616cba79c5384e8c8c8568c77 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Jan 17 14:22:49 2018 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:36:01 2018 +0100 [USBPORT] Fixing use DeviceSpeed instead Direction. --- drivers/usb/usbport/usb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 86cd1e1474..7d2c9a308d 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -127,7 +127,7 @@ USB2_GetOverhead(IN PUSB2_TT_ENDPOINT TtEndpoint) TransferType = TtEndpoint->TtEndpointParams.TransferType; Direction = TtEndpoint->TtEndpointParams.Direction; - DeviceSpeed = TtEndpoint->TtEndpointParams.Direction; + DeviceSpeed = TtEndpoint->TtEndpointParams.DeviceSpeed; HostDelay = TtEndpoint->Tt->HcExtension->HcDelayTime;

1 0

72/77: [USBPORT] Add a space in indentation.
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4dee8e3ac894062b4eb3… commit a4dee8e3ac894062b4eb3e86c6333c071c2e9b77 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Wed Jan 17 06:50:04 2018 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:36:00 2018 +0100 [USBPORT] Add a space in indentation. --- drivers/usb/usbport/usb2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index f8bfc04dad..86cd1e1474 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -259,9 +259,9 @@ USB2_GetStartTime(IN PUSB2_TT_ENDPOINT nextTtEndpoint, ttEndpoint = TtEndpoint->Tt->FrameBudget[Frame].AltEndpoint; if (ttEndpoint) - return ttEndpoint->StartTime + ttEndpoint->CalcBusTime; + return ttEndpoint->StartTime + ttEndpoint->CalcBusTime; else - return USB2_FS_SOF_TIME; + return USB2_FS_SOF_TIME; } else {

1 0

71/77: [USBPORT] Delete DPRINTs.
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ecd0097e37cc0fd277a38… commit ecd0097e37cc0fd277a385bbc9c3fc2b2b1a3987 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Thu Jan 11 17:12:16 2018 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:36:00 2018 +0100 [USBPORT] Delete DPRINTs. --- drivers/usb/usbport/usb2.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index 6c1e23ddbb..f8bfc04dad 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -645,7 +645,7 @@ USB2_MoveTtEndpoint(IN PUSB2_TT_ENDPOINT TtEndpoint, if (Rebalance->RebalanceEndpoint[Num] && TtEndpoint->TtEndpointParams.EndpointMoved == TRUE && - (TransferType != USBPORT_TRANSFER_TYPE_INTERRUPT || BusTime >= 0)) + ((TransferType != USBPORT_TRANSFER_TYPE_INTERRUPT) || BusTime >= 0)) { DPRINT("USB2_MoveTtEndpoint: result - FALSE\n"); return FALSE; @@ -1179,12 +1179,10 @@ USB2_DeallocateEndpointBudget(IN PUSB2_TT_ENDPOINT TtEndpoint, if (Tt->FrameBudget[frame].IsoEndpoint->NextTtEndpoint) { endpoint = Tt->FrameBudget[frame].IsoEndpoint->NextTtEndpoint; - DPRINT("USB2_DeallocateEndpointBudget: endpoint - %p\n", endpoint); } else if (Tt->FrameBudget[frame].AltEndpoint) { endpoint = Tt->FrameBudget[frame].AltEndpoint; - DPRINT("USB2_DeallocateEndpointBudget: endpoint - %p\n", endpoint); } } } @@ -1705,7 +1703,7 @@ USB2_PromotePeriods(IN PUSB2_TT_ENDPOINT TtEndpoint, if (ttEndpoint->ActualPeriod != ENDPOINT_INTERRUPT_1ms && TransferType == USBPORT_TRANSFER_TYPE_INTERRUPT && - ttEndpoint->StartMicroframe > 2) + (CHAR)ttEndpoint->StartMicroframe > 2) { USB2_DeallocateEndpointBudget(ttEndpoint, Rebalance, @@ -1881,7 +1879,6 @@ USBPORT_AllocateBandwidthUSB2(IN PDEVICE_OBJECT FdoDevice, case UsbFullSpeed: { Tt = &TtExtension->Tt; - Period = USB2_FRAMES; while (Period > 0 && Period > EndpointProperties->Period) @@ -1992,7 +1989,6 @@ USBPORT_AllocateBandwidthUSB2(IN PDEVICE_OBJECT FdoDevice, ASSERT(ActualPeriod); Factor = USB2_FRAMES / ActualPeriod; - n = ScheduleOffset * Factor; if (TtExtension)

1 0

70/77: [USBPORT] Add USB2_PREV_MICROFRAME constant.
by Vadim Galyant 29 Mar '18

29 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f8079df3a98336576dad… commit 0f8079df3a98336576dadc06d2d7fd99a13499b7 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Thu Jan 11 14:23:49 2018 +0900 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Jan 21 19:35:59 2018 +0100 [USBPORT] Add USB2_PREV_MICROFRAME constant. --- drivers/usb/usbport/usb2.c | 14 +++++++------- drivers/usb/usbport/usbport.h | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/usb/usbport/usb2.c b/drivers/usb/usbport/usb2.c index cc833e308f..6c1e23ddbb 100644 --- a/drivers/usb/usbport/usb2.c +++ b/drivers/usb/usbport/usb2.c @@ -377,7 +377,7 @@ USB2_AllocateHS(IN PUSB2_TT_ENDPOINT TtEndpoint, frame = TtEndpoint->StartFrame + Frame; uframe = TtEndpoint->StartMicroframe; - if (TtEndpoint->StartMicroframe == 0xFF) + if (TtEndpoint->StartMicroframe == USB2_PREV_MICROFRAME) USB2_GetPrevMicroFrame(&frame, &uframe); for (ix = 0; ix < TtEndpoint->Nums.NumStarts; ix++) @@ -426,7 +426,7 @@ USB2_AllocateHS(IN PUSB2_TT_ENDPOINT TtEndpoint, frame = TtEndpoint->StartFrame + Frame; uframe = TtEndpoint->StartMicroframe; - if (uframe == 0xFF) + if (uframe == USB2_PREV_MICROFRAME) USB2_GetPrevMicroFrame(&frame, &uframe); DataTime = 0; @@ -535,7 +535,7 @@ USB2_DeallocateHS(IN PUSB2_TT_ENDPOINT TtEndpoint, frame = TtEndpoint->StartFrame + Frame; uframe = TtEndpoint->StartMicroframe; - if (TtEndpoint->StartMicroframe == 0xFF) + if (TtEndpoint->StartMicroframe == USB2_PREV_MICROFRAME) USB2_GetPrevMicroFrame(&frame, &uframe); for (ix = 0; ix < TtEndpoint->Nums.NumStarts; ix++) @@ -563,7 +563,7 @@ USB2_DeallocateHS(IN PUSB2_TT_ENDPOINT TtEndpoint, frame = TtEndpoint->StartFrame + Frame; uframe = TtEndpoint->StartMicroframe; - if (TtEndpoint->StartMicroframe == 0xFF) + if (TtEndpoint->StartMicroframe == USB2_PREV_MICROFRAME) USB2_GetPrevMicroFrame(&frame, &uframe); DataTime = 0; @@ -733,7 +733,7 @@ USB2_ConvertFrame(IN UCHAR Frame, Frame, Microframe); - if (Microframe == 0xFF) + if (Microframe == USB2_PREV_MICROFRAME) { *HcFrame = Frame; *HcMicroframe = 0; @@ -2202,7 +2202,7 @@ USB2_InitTT(IN PUSB2_HC_EXTENSION HcExtension, Tt->IsoEndpoint[ix].ActualPeriod = USB2_FRAMES; Tt->IsoEndpoint[ix].CalcBusTime = USB2_FS_SOF_TIME + USB2_HUB_DELAY; Tt->IsoEndpoint[ix].StartFrame = ix; - Tt->IsoEndpoint[ix].StartMicroframe = 0xFF; + Tt->IsoEndpoint[ix].StartMicroframe = USB2_PREV_MICROFRAME; Tt->FrameBudget[ix].IntEndpoint = &Tt->IntEndpoint[ix]; @@ -2217,7 +2217,7 @@ USB2_InitTT(IN PUSB2_HC_EXTENSION HcExtension, Tt->IntEndpoint[ix].ActualPeriod = USB2_FRAMES; Tt->IntEndpoint[ix].CalcBusTime = USB2_FS_SOF_TIME + USB2_HUB_DELAY; Tt->IntEndpoint[ix].StartFrame = ix; - Tt->IntEndpoint[ix].StartMicroframe = 0xFF; + Tt->IntEndpoint[ix].StartMicroframe = USB2_PREV_MICROFRAME; } } diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h index 682e4e1f74..55c97e5330 100644 --- a/drivers/usb/usbport/usbport.h +++ b/drivers/usb/usbport/usbport.h @@ -451,6 +451,7 @@ typedef struct _TIMER_WORK_QUEUE_ITEM { #define USB2_FRAMES 32 #define USB2_MICROFRAMES 8 #define USB2_MAX_MICROFRAMES (USB2_FRAMES * USB2_MICROFRAMES) +#define USB2_PREV_MICROFRAME 0xFF #define USB2_MAX_MICROFRAME_ALLOCATION 7000 // bytes #define USB2_CONTROLLER_DELAY 100

1 0

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