Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55966: [USBCCG] - Remove hacks - Include alternate interface descriptors in the configuration descriptor
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 15:08:28 2012 New Revision: 55966 URL: http://svn.reactos.org/svn/reactos?rev=55966&view=rev Log: [USBCCG] - Remove hacks - Include alternate interface descriptors in the configuration descriptor Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c trunk/reactos/drivers/usb/usbccgp/function.c trunk/reactos/drivers/usb/usbccgp/pdo.c Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Sat Mar 3 15:08:28 2012 @@ -220,76 +220,32 @@ return Status; } -ULONG -CountInterfaceDescriptors( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) -{ - PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PVOID CurrentPosition; - ULONG Count = 0; - - // - // enumerate all interfaces - // - CurrentPosition = ConfigurationDescriptor; - do - { - // - // find next descriptor - // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, CurrentPosition, -1, -1, -1, -1, -1); - if (!InterfaceDescriptor) - break; - - // - // advance to next descriptor - // - CurrentPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - - // - // increment descriptor count - // - Count++; - - }while(TRUE); - - // - // done - // - return Count; -} - NTSTATUS AllocateInterfaceDescriptorsArray( IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, OUT PUSB_INTERFACE_DESCRIPTOR **OutArray) { PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PVOID CurrentPosition; ULONG Count = 0; PUSB_INTERFACE_DESCRIPTOR *Array; - Count = CountInterfaceDescriptors(ConfigurationDescriptor); - ASSERT(Count); - // // allocate array // - Array = AllocateItem(NonPagedPool, sizeof(PUSB_INTERFACE_DESCRIPTOR) * Count); + Array = AllocateItem(NonPagedPool, sizeof(PUSB_INTERFACE_DESCRIPTOR) * ConfigurationDescriptor->bNumInterfaces); if (!Array) return STATUS_INSUFFICIENT_RESOURCES; // // enumerate all interfaces // - CurrentPosition = ConfigurationDescriptor; Count = 0; do { // // find next descriptor // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, CurrentPosition, -1, -1, -1, -1, -1); + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, Count, 0, -1, -1, -1); if (!InterfaceDescriptor) break; @@ -298,11 +254,6 @@ // Array[Count] = InterfaceDescriptor; Count++; - - // - // advance to next descriptor - // - CurrentPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); }while(TRUE); Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Sat Mar 3 15:08:28 2012 @@ -711,7 +711,6 @@ PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, FirstDescriptor = NULL; PFDO_DEVICE_EXTENSION FDODeviceExtension; NTSTATUS Status = STATUS_SUCCESS; - PVOID StartPosition; // // get device extension @@ -723,21 +722,15 @@ // // first check if all interfaces belong to the same audio class // - StartPosition = FDODeviceExtension->ConfigurationDescriptor; - for(Index = 0; Index < CountInterfaceDescriptors(FDODeviceExtension->ConfigurationDescriptor); Index++) + for(Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) { // // get interface descriptor // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, StartPosition, -1, -1, -1, -1, -1); + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->ConfigurationDescriptor, Index, 0, -1, -1, -1); DPRINT1("Index %lu Descriptor %p\n", Index, InterfaceDescriptor); ASSERT(InterfaceDescriptor); - // - // move to next descriptor - // - StartPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - if (InterfaceDescriptor->bInterfaceClass != 0x1) { // @@ -816,7 +809,7 @@ // // number of interfaces // - FDODeviceExtension->FunctionDescriptor[0].NumberOfInterfaces = CountInterfaceDescriptors(FDODeviceExtension->ConfigurationDescriptor); + FDODeviceExtension->FunctionDescriptor[0].NumberOfInterfaces = FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; // // store function count Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Sat Mar 3 15:08:28 2012 @@ -460,6 +460,7 @@ PURB Urb; PVOID Buffer; PUCHAR BufferPtr; + UCHAR InterfaceNumber; // // get current stack location @@ -489,6 +490,7 @@ // get current interface descriptor // InterfaceDescriptor = PDODeviceExtension->FunctionDescriptor->InterfaceDescriptorList[Index]; + InterfaceNumber = InterfaceDescriptor->bInterfaceNumber; // // add to size and move to next descriptor @@ -513,10 +515,17 @@ { if (InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { + if (InterfaceNumber != InterfaceDescriptor->bInterfaceNumber) + { + // + // reached next descriptor + // + break; + } + // - // reached next descriptor + // include alternate descriptor // - break; } // @@ -557,6 +566,7 @@ // get current interface descriptor // InterfaceDescriptor = PDODeviceExtension->FunctionDescriptor->InterfaceDescriptorList[Index]; + InterfaceNumber = InterfaceDescriptor->bInterfaceNumber; // // copy descriptor and move to next descriptor @@ -582,10 +592,18 @@ { if (InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { + if (InterfaceNumber != InterfaceDescriptor->bInterfaceNumber) + { + // + // reached next descriptor + // + break; + } + // - // reached next descriptor + // include alternate descriptor // - break; + DPRINT("InterfaceDescriptor %p Alternate %x InterfaceNumber %x\n", InterfaceDescriptor, InterfaceDescriptor->bAlternateSetting, InterfaceDescriptor->bInterfaceNumber); } // @@ -645,7 +663,7 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PURB Urb, NewUrb; PUSBD_INTERFACE_INFORMATION InterfaceInformation; - ULONG InterfaceInformationCount, Index, InterfaceIndex; + ULONG InterfaceIndex, Length; PUSBD_INTERFACE_LIST_ENTRY Entry; ULONG NeedSelect, FoundInterface; NTSTATUS Status; @@ -677,28 +695,25 @@ return STATUS_SUCCESS; } - // - // count interface information - // - InterfaceInformationCount = 0; + // sanity checks + //C_ASSERT(sizeof(struct _URB_HEADER) == 16); + //C_ASSERT(FIELD_OFFSET(struct _URB_SELECT_CONFIGURATION, Interface.Length) == 24); + //C_ASSERT(sizeof(USBD_INTERFACE_INFORMATION) == 36); + //C_ASSERT(sizeof(struct _URB_SELECT_CONFIGURATION) == 0x3C); + + // available buffer length + Length = Urb->UrbSelectConfiguration.Hdr.Length - FIELD_OFFSET(struct _URB_SELECT_CONFIGURATION, Interface.Length); + + // + // check all interfaces + // InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; + + Entry = NULL; do { - InterfaceInformationCount++; - InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + InterfaceInformation->Length); - }while((ULONG_PTR)InterfaceInformation < (ULONG_PTR)Urb + Urb->UrbSelectConfiguration.Hdr.Length); - - // - // check all interfaces - // - InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; - Index = 0; - Entry = NULL; - DPRINT("Count %x\n", InterfaceInformationCount); - do - { - DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting); - + DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x Length %lu InterfaceInformation->Length %lu\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting, Length, InterfaceInformation->Length); + ASSERT(InterfaceInformation->Length); // // search for the interface in the local interface list // @@ -778,7 +793,19 @@ // // interface is already selected // - RtlCopyMemory(InterfaceInformation, Entry->Interface, min(InterfaceInformation->Length, Entry->Interface->Length)); + ASSERT(Length >= Entry->Interface->Length); + RtlCopyMemory(InterfaceInformation, Entry->Interface, Entry->Interface->Length); + + // + // adjust remaining buffer size + // + ASSERT(Entry->Interface->Length); + Length -= Entry->Interface->Length; + + // + // move to next output interface information + // + InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + Entry->Interface->Length); } else { @@ -811,23 +838,37 @@ Status = USBCCGP_SyncUrbRequest(PDODeviceExtension->NextDeviceObject, NewUrb); DPRINT1("SelectInterface Status %x\n", Status); - // - // did it succeeed - // - if (NT_SUCCESS(Status)) - { - // - // update configuration info - // - ASSERT(Entry->Interface->Length == NewUrb->UrbSelectInterface.Interface.Length); - ASSERT(InterfaceInformation->Length == NewUrb->UrbSelectInterface.Interface.Length); - RtlCopyMemory(Entry->Interface, &NewUrb->UrbSelectInterface.Interface, NewUrb->UrbSelectInterface.Interface.Length); - - // - // update provided interface information - // - RtlCopyMemory(InterfaceInformation, Entry->Interface, Entry->Interface->Length); - } + if (!NT_SUCCESS(Status)) + { + // + // failed + // + break; + } + + // + // update configuration info + // + ASSERT(Entry->Interface->Length >= NewUrb->UrbSelectInterface.Interface.Length); + ASSERT(Length >= NewUrb->UrbSelectInterface.Interface.Length); + RtlCopyMemory(Entry->Interface, &NewUrb->UrbSelectInterface.Interface, NewUrb->UrbSelectInterface.Interface.Length); + + // + // update provided interface information + // + ASSERT(Length >= Entry->Interface->Length); + RtlCopyMemory(InterfaceInformation, Entry->Interface, Entry->Interface->Length); + + // + // decrement remaining buffer size + // + ASSERT(Entry->Interface->Length); + Length -= Entry->Interface->Length; + + // + // adjust output buffer offset + // + InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + Entry->Interface->Length); // // free urb @@ -835,12 +876,7 @@ FreeItem(NewUrb); } - // - // move to next information - // - InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + InterfaceInformation->Length); - Index++; - }while(Index < InterfaceInformationCount); + }while(Length); // // store configuration handle

1 0

[janderwald] 55965: [USBD] - Rewrite broken USBD_CreateConfigurationRequestEx - It did not calculate the required urb size correctly - It did not store the correct number of provided interfaces - L...
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 14:41:12 2012 New Revision: 55965 URL: http://svn.reactos.org/svn/reactos?rev=55965&view=rev Log: [USBD] - Rewrite broken USBD_CreateConfigurationRequestEx - It did not calculate the required urb size correctly - It did not store the correct number of provided interfaces - Length of each interface information was wrong Modified: trunk/reactos/drivers/usb/usbd/usbd.c Modified: trunk/reactos/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] Sat Mar 3 14:41:12 2012 @@ -32,17 +32,15 @@ * USBD_GetPdoRegistryParameters (implemented) */ +#define _USBD_ +#define NDEBUG #include <ntddk.h> #include <usbdi.h> -#define NDEBUG +#include <usbdlib.h> #include <debug.h> #ifndef PLUGPLAY_REGKEY_DRIVER #define PLUGPLAY_REGKEY_DRIVER 2 #endif -typedef struct _USBD_INTERFACE_LIST_ENTRY { - PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PUSBD_INTERFACE_INFORMATION Interface; -} USBD_INTERFACE_LIST_ENTRY, *PUSBD_INTERFACE_LIST_ENTRY; NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, @@ -335,39 +333,61 @@ { PURB Urb; ULONG UrbSize = 0; - ULONG InterfaceCount; + ULONG InterfaceCount = 0, PipeCount = 0; ULONG InterfaceNumber, EndPointNumber; PUSBD_INTERFACE_INFORMATION InterfaceInfo; - for (InterfaceCount = 0; - InterfaceList[InterfaceCount].InterfaceDescriptor != NULL; - InterfaceCount++) - { - UrbSize += sizeof(USBD_INTERFACE_INFORMATION); - UrbSize += (InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION); - } - - UrbSize += sizeof(URB) + sizeof(USBD_INTERFACE_INFORMATION); - + while(InterfaceList[InterfaceCount].InterfaceDescriptor) + { + // pipe count + PipeCount += InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints; + + // interface count + InterfaceCount++; + } + + // size of urb + UrbSize = GET_SELECT_CONFIGURATION_REQUEST_SIZE(InterfaceCount, PipeCount); + + // allocate urb Urb = ExAllocatePool(NonPagedPool, UrbSize); + if (!Urb) + { + // no memory + return NULL; + } + + // zero urb RtlZeroMemory(Urb, UrbSize); + + // init urb header Urb->UrbSelectConfiguration.Hdr.Function = URB_FUNCTION_SELECT_CONFIGURATION; - Urb->UrbSelectConfiguration.Hdr.Length = sizeof(Urb->UrbSelectConfiguration); + Urb->UrbSelectConfiguration.Hdr.Length = UrbSize; Urb->UrbSelectConfiguration.ConfigurationDescriptor = ConfigurationDescriptor; + // init interface information InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; for (InterfaceNumber = 0; InterfaceNumber < InterfaceCount; InterfaceNumber++) { + // init interface info InterfaceList[InterfaceNumber].Interface = InterfaceInfo; - InterfaceInfo->Length = sizeof(USBD_INTERFACE_INFORMATION) + - ((InterfaceList[InterfaceNumber].InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION)); InterfaceInfo->InterfaceNumber = InterfaceList[InterfaceNumber].InterfaceDescriptor->bInterfaceNumber; InterfaceInfo->AlternateSetting = InterfaceList[InterfaceNumber].InterfaceDescriptor->bAlternateSetting; InterfaceInfo->NumberOfPipes = InterfaceList[InterfaceNumber].InterfaceDescriptor->bNumEndpoints; + + // store length + InterfaceInfo->Length = GET_USBD_INTERFACE_SIZE(InterfaceList[InterfaceNumber].InterfaceDescriptor->bNumEndpoints); + + // sanity check + //C_ASSERT(FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes) == 16); + for (EndPointNumber = 0; EndPointNumber < InterfaceInfo->NumberOfPipes; EndPointNumber++) { + // init max transfer size InterfaceInfo->Pipes[EndPointNumber].MaximumTransferSize = PAGE_SIZE; } + + // next interface info InterfaceInfo = (PUSBD_INTERFACE_INFORMATION) ((ULONG_PTR)InterfaceInfo + InterfaceInfo->Length); }

1 0

[janderwald] 55964: [USBHUB] - Handle retrieving string descriptors failure
by janderwald＠svn.reactos.org 03 Mar '12

03 Mar '12

Author: janderwald Date: Sat Mar 3 11:38:37 2012 New Revision: 55964 URL: http://svn.reactos.org/svn/reactos?rev=55964&view=rev Log: [USBHUB] - Handle retrieving string descriptors failure Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Mar 3 11:38:37 2012 @@ -997,7 +997,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - RtlInitUnicodeString(&UsbChildExtension->usTextDescription, L""); + RtlInitUnicodeString(&UsbChildExtension->usTextDescription, L"USB Device"); // FIXME NON-NLS } else { @@ -1048,7 +1048,7 @@ DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); } - return Status; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Mar 3 11:38:37 2012 @@ -533,8 +533,8 @@ if (SourceString) { - ReturnString = ExAllocatePool(PagedPool, SourceString->Length); - RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->Length); + ReturnString = ExAllocatePool(PagedPool, SourceString->MaximumLength); + RtlCopyMemory(ReturnString, SourceString->Buffer, SourceString->MaximumLength); DPRINT1("%S\n", ReturnString); *Information = (ULONG_PTR)ReturnString; }

1 0

[cgutman] 55963: - Enable debugging for testbot
by cgutman＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: cgutman Date: Fri Mar 2 20:49:53 2012 New Revision: 55963 URL: http://svn.reactos.org/svn/reactos?rev=55963&view=rev Log: - Enable debugging for testbot Modified: trunk/reactos/base/setup/usetup/filequeue.c Modified: trunk/reactos/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] Fri Mar 2 20:49:53 2012 @@ -382,7 +382,7 @@ } /* FIXME: Do it! */ - DPRINT("'%S' ==> '%S'\n", + DPRINT1("'%S' ==> '%S'\n", FileSrcPath, FileDstPath);

1 0

[janderwald] 55962: [NDK] - Add missing definitions
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 20:08:51 2012 New Revision: 55962 URL: http://svn.reactos.org/svn/reactos?rev=55962&view=rev Log: [NDK] - Add missing definitions Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Fri Mar 2 20:08:51 2012 @@ -171,12 +171,30 @@ // typedef enum _PLUGPLAY_CONTROL_CLASS { - PlugPlayControlUserResponse = 0x07, - PlugPlayControlProperty = 0x0A, - PlugPlayControlGetRelatedDevice = 0x0C, - PlugPlayControlDeviceStatus = 0x0E, + PlugPlayControlEnumerateDevice, + PlugPlayControlRegisterNewDevice, + PlugPlayControlDeregisterDevice, + PlugPlayControlInitializeDevice, + PlugPlayControlStartDevice, + PlugPlayControlUnlockDevice, + PlugPlayControlQueryAndRemoveDevice, + PlugPlayControlUserResponse, + PlugPlayControlGenerateLegacyDevice, + PlugPlayControlGetInterfaceDeviceList, + PlugPlayControlProperty, + PlugPlayControlDeviceClassAssociation, + PlugPlayControlGetRelatedDevice, + PlugPlayControlGetInterfaceDeviceAlias, + PlugPlayControlDeviceStatus, PlugPlayControlGetDeviceDepth, - PlugPlayControlResetDevice = 0x14 + PlugPlayControlQueryDeviceRelations, + PlugPlayControlTargetDeviceRelation, + PlugPlayControlQueryConflictList, + PlugPlayControlRetrieveDock, + PlugPlayControlResetDevice, + PlugPlayControlHaltDevice, + PlugPlayControlGetBlockedDriverList, + MaxPlugPlayControl } PLUGPLAY_CONTROL_CLASS; typedef enum _PLUGPLAY_BUS_CLASS

1 0

[janderwald] 55961: [USBUHCI] - Load USBUHCI during 1st stage setup
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 18:30:46 2012 New Revision: 55961 URL: http://svn.reactos.org/svn/reactos?rev=55961&view=rev Log: [USBUHCI] - Load USBUHCI during 1st stage setup Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Mar 2 18:30:46 2012 @@ -94,7 +94,7 @@ [InputDevicesSupport.Load] usbehci = usbehci.sys usbohci = usbohci.sys -;usbuhci = usbuhci.sys +usbuhci = usbuhci.sys usbhub = usbhub.sys usbccgp = usbccgp.sys hidusb = hidusb.sys

1 0

[janderwald] 55960: [USBEHCI] - Check if allocation of queue heads failed - Implement removing of completed queue head
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 18:26:08 2012 New Revision: 55960 URL: http://svn.reactos.org/svn/reactos?rev=55960&view=rev Log: [USBEHCI] - Check if allocation of queue heads failed - Implement removing of completed queue head Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Fri Mar 2 18:26:08 2012 @@ -71,6 +71,9 @@ // called for each completed queue head VOID QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); + // called for each completed queue head + VOID QueueHeadInterruptCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); + // called when the completion queue is cleaned up VOID QueueHeadCleanup(PQUEUE_HEAD QueueHead); @@ -80,10 +83,15 @@ // links interrupt queue head VOID LinkInterruptQueueHead(PQUEUE_HEAD QueueHead); + // interval index + UCHAR GetIntervalIndex(UCHAR Interval); + + // interrupt queue heads PQUEUE_HEAD m_InterruptQueueHeads[EHCI_INTERRUPT_ENTRIES_COUNT]; - + // contains the periodic queue heads + LIST_ENTRY m_PeriodicQueueHeads; }; //================================================================================================= @@ -151,6 +159,11 @@ InitializeListHead(&m_PendingRequestAsyncList); // + // initialize periodic queue heads + // + InitializeListHead(&m_PeriodicQueueHeads); + + // // now initialize sync schedule // Status = InitializeSyncSchedule(m_Hardware, MemManager); @@ -198,6 +211,14 @@ // allocate queue head // Status = MemManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysAddr); + if (!NT_SUCCESS(Status)) + { + // + // failed to create queue head + // + DPRINT1("Failed to create queue head\n"); + return Status; + } // // initialize queue head @@ -347,46 +368,11 @@ return Status; } -VOID -CUSBQueue::LinkInterruptQueueHead( - PQUEUE_HEAD QueueHead) -{ - PEHCIREQUEST Request; - UCHAR Interval, IntervalIndex; - USB_DEVICE_SPEED DeviceSpeed; - PQUEUE_HEAD InterruptQueueHead; - - // get internal req - Request = PEHCIREQUEST(QueueHead->Request); - ASSERT(Request); - - // get interval - Interval = Request->GetInterval(); - - // get device speed - DeviceSpeed = Request->GetSpeed(); - if (DeviceSpeed == UsbHighSpeed) - { - // interrupt queue head can be scheduled on each possible micro frame - QueueHead->EndPointCapabilities.InterruptScheduleMask = 0xFF; - } - else - { - // As we do not yet support FSTNs to correctly reference low/full - // speed interrupt transfers, we simply put them into the 1 interval - // queue. This way we ensure that we reach them on every micro frame - // and can do the corresponding start/complete split transactions. - // ToDo: use FSTNs to correctly link non high speed interrupt transfers - Interval = 1; - - // For now we also force start splits to be in micro frame 0 and - // complete splits to be in micro frame 2, 3 and 4. - QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x01; - QueueHead->EndPointCapabilities.SplitCompletionMask = 0x1C; - } - - // sanitize interrupt interval - Interval = max(1, Interval); +UCHAR +CUSBQueue::GetIntervalIndex( + UCHAR Interval) +{ + UCHAR IntervalIndex; if (Interval == 1) IntervalIndex = 1; @@ -409,6 +395,54 @@ else IntervalIndex = 10; + return IntervalIndex; +} + +VOID +CUSBQueue::LinkInterruptQueueHead( + PQUEUE_HEAD QueueHead) +{ + PEHCIREQUEST Request; + UCHAR Interval, IntervalIndex; + USB_DEVICE_SPEED DeviceSpeed; + PQUEUE_HEAD InterruptQueueHead; + + // get internal req + Request = PEHCIREQUEST(QueueHead->Request); + ASSERT(Request); + + // get interval + Interval = Request->GetInterval(); + + // get device speed + DeviceSpeed = Request->GetSpeed(); + if (DeviceSpeed == UsbHighSpeed) + { + // interrupt queue head can be scheduled on each possible micro frame + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0xFF; + } + else + { + // As we do not yet support FSTNs to correctly reference low/full + // speed interrupt transfers, we simply put them into the 1 interval + // queue. This way we ensure that we reach them on every micro frame + // and can do the corresponding start/complete split transactions. + // ToDo: use FSTNs to correctly link non high speed interrupt transfers + Interval = 1; + + // For now we also force start splits to be in micro frame 0 and + // complete splits to be in micro frame 2, 3 and 4. + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x01; + QueueHead->EndPointCapabilities.SplitCompletionMask = 0x1C; + } + + // sanitize interrupt interval + Interval = max(1, Interval); + + // get interval index + IntervalIndex = GetIntervalIndex(Interval); + + // get interrupt queue head InterruptQueueHead = m_InterruptQueueHeads[IntervalIndex]; @@ -418,6 +452,9 @@ InterruptQueueHead->HorizontalLinkPointer = QueueHead->PhysicalAddr | QH_TYPE_QH; InterruptQueueHead->NextQueueHead = QueueHead; + + // store in periodic list + InsertTailList(&m_PeriodicQueueHeads, &QueueHead->LinkedQueueHeads); } // @@ -595,6 +632,67 @@ } VOID +CUSBQueue::QueueHeadInterruptCompletion( + PQUEUE_HEAD QueueHead, + NTSTATUS Status) +{ + PEHCIREQUEST Request; + UCHAR Interval, IntervalIndex; + PQUEUE_HEAD InterruptQueueHead, LastQueueHead = NULL; + + + // + // sanity check + // + PC_ASSERT(QueueHead->Request); + + // + // get IUSBRequest interface + // + Request = (PEHCIREQUEST)QueueHead->Request; + + // get interval + Interval = Request->GetInterval(); + + // sanitize interval + Interval = max(1, Interval); + + // get interval index + IntervalIndex = GetIntervalIndex(Interval); + + // get interrupt queue head from index + InterruptQueueHead = m_InterruptQueueHeads[IntervalIndex]; + + while(InterruptQueueHead != NULL) + { + if (InterruptQueueHead == QueueHead) + break; + + // move to next queue head + LastQueueHead = InterruptQueueHead; + InterruptQueueHead = (PQUEUE_HEAD)InterruptQueueHead->NextQueueHead; + } + + if (InterruptQueueHead != QueueHead) + { + // queue head not in list + ASSERT(FALSE); + return; + } + + // now unlink queue head + LastQueueHead->HorizontalLinkPointer = QueueHead->HorizontalLinkPointer; + LastQueueHead->NextQueueHead = QueueHead->NextQueueHead; + + DPRINT1("Periodic QueueHead %p Addr $x unlinked\n", QueueHead, QueueHead->PhysicalAddr); + + // insert into completed list + InsertTailList(&m_CompletedRequestAsyncList, &QueueHead->LinkedQueueHeads); +} + + + +VOID CUSBQueue::QueueHeadCompletion( PQUEUE_HEAD CurrentQH, NTSTATUS Status) @@ -619,15 +717,6 @@ VOID CUSBQueue::ProcessPeriodicSchedule( - IN NTSTATUS Status, - OUT PULONG ShouldRingDoorBell) -{ - - -} - -VOID -CUSBQueue::ProcessAsyncList( IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell) { @@ -646,6 +735,82 @@ // walk async list // ASSERT(AsyncListQueueHead); + Entry = m_PeriodicQueueHeads.Flink; + + while(Entry != &m_PeriodicQueueHeads) + { + // + // get queue head structure + // + QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + ASSERT(QueueHead); + + // + // sanity check + // + PC_ASSERT(QueueHead->Request); + + // + // get IUSBRequest interface + // + Request = (PEHCIREQUEST)QueueHead->Request; + + // + // move to next entry + // + Entry = Entry->Flink; + + // + // check if queue head is complete + // + IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead); + + DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); + + // + // check if queue head is complete + // + if (IsQueueHeadComplete) + { + // + // current queue head is complete + // + QueueHeadInterruptCompletion(QueueHead, Status); + + // + // ring door bell is going to be necessary + // + *ShouldRingDoorBell = TRUE; + } + } + + // + // release lock + // + KeReleaseSpinLock(m_Lock, OldLevel); + +} + +VOID +CUSBQueue::ProcessAsyncList( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + KIRQL OldLevel; + PLIST_ENTRY Entry; + PQUEUE_HEAD QueueHead; + PEHCIREQUEST Request; + BOOLEAN IsQueueHeadComplete; + + // + // lock completed async list + // + KeAcquireSpinLock(m_Lock, &OldLevel); + + // + // walk async list + // + ASSERT(AsyncListQueueHead); Entry = AsyncListQueueHead->LinkedQueueHeads.Flink; while(Entry != &AsyncListQueueHead->LinkedQueueHeads)

1 0

[cgutman] 55959: [USBUHCI] - Enable usbuhci for testing [USBOHCI] - Add back getting port count in a loop to work around AMD chipset errata
by cgutman＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: cgutman Date: Fri Mar 2 18:02:50 2012 New Revision: 55959 URL: http://svn.reactos.org/svn/reactos?rev=55959&view=rev Log: [USBUHCI] - Enable usbuhci for testing [USBOHCI] - Add back getting port count in a loop to work around AMD chipset errata Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/media/inf/usbport.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Mar 2 18:02:50 2012 @@ -16,8 +16,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" @@ -1511,11 +1511,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001 ; UHCI controller driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 ; USB storage driver HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Mar 2 18:02:50 2012 @@ -39,7 +39,7 @@ usbccgp.sys=,,,,,,x,,,,,,4 usbd.sys=,,,,,,x,,,,,,4 usbhub.sys=,,,,,,x,,,,,,4 -;usbuhci.sys=,,,,,,x,,,,,,4 +usbuhci.sys=,,,,,,x,,,,,,4 usbohci.sys=,,,,,,x,,,,,,4 usbehci.sys=,,,,,,x,,,,,,4 usbstor.sys=,,,,,,x,,,,,,4 @@ -75,7 +75,7 @@ ;USB\CLASS_09 = usbhub USB\ROOT_HUB = usbhub USB\ROOT_HUB20 = usbhub -;PCI\CC_0C0300 = usbuhci +PCI\CC_0C0300 = usbuhci PCI\CC_0C0310 = usbohci PCI\CC_0C0320 = usbehci USB\Class_08&SubClass_06&Prot_50 = usbstor Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Mar 2 18:02:50 2012 @@ -662,9 +662,14 @@ Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); // - // get port count - // - m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); + // get port count (in a loop due to AMD errata) + // + do + { + KeStallExecutionProcessor(20); + m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); + } while (m_NumberOfPorts == 0); + DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); ASSERT(m_NumberOfPorts < OHCI_MAX_PORT_COUNT); Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 55958: [STORAGE] - Experimental change to try to increase real hardware compatibility - Load both atapi and uniata and allow atapi to have priority and uniata will pick up devices that at...
by cgutman＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: cgutman Date: Fri Mar 2 17:19:04 2012 New Revision: 55958 URL: http://svn.reactos.org/svn/reactos?rev=55958&view=rev Log: [STORAGE] - Experimental change to try to increase real hardware compatibility - Load both atapi and uniata and allow atapi to have priority and uniata will pick up devices that atapi doesn't like - Fix a bug in uniata enumeration Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Mar 2 17:19:04 2012 @@ -1240,13 +1240,21 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 -; UniATA/Atapi miniport driver +; ATAPI miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Group",0x00000000,"SCSI Miniport" +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Tag",0x00010001,0x00000010 + +; UNIATA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"SCSI Miniport" HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000020 ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Mar 2 17:19:04 2012 @@ -17,8 +17,9 @@ [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4 +atapi.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,x,,,,,,4 nmidebug.sys=,,,,,,x,,,,,,4 -uniata.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 bootvid.dll=,,,,,,,,,,,,2 @@ -70,7 +71,7 @@ PCI\CC_0104 = uniata PCI\CC_0105 = uniata PCI\CC_0106 = uniata -*PNP0600 = uniata +*PNP0600 = atapi ;USB\CLASS_09 = usbhub USB\ROOT_HUB = usbhub USB\ROOT_HUB20 = usbhub Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Fri Mar 2 17:19:04 2012 @@ -8858,17 +8858,21 @@ } continue; } - BMList[i].AltInitMasterDev = (UCHAR)0xff; - if(GlobalConfig->AtDiskPrimaryAddressClaimed) PrimaryClaimed = TRUE; if(GlobalConfig->AtDiskSecondaryAddressClaimed) SecondaryClaimed = TRUE; + + if(PrimaryClaimed && SecondaryClaimed) { + KdPrint2((PRINT_PREFIX "Both legacy channels claimed\n")); + break; + } + + BMList[i].AltInitMasterDev = (UCHAR)0xff; if(g_opt_Verbose) { _PrintNtConsole("Init standard Dual-channel PCI ATA controller:"); } - for(alt = 0; alt < (ULONG)(WinVer_WDM_Model ? 1 : 2) ; alt++) { Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5595… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 55957: [USBEHCI] - Partly implement support for interrupt transfers, WIP, untested
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 14:21:44 2012 New Revision: 55957 URL: http://svn.reactos.org/svn/reactos?rev=55957&view=rev Log: [USBEHCI] - Partly implement support for interrupt transfers, WIP, untested Modified: trunk/reactos/drivers/usb/usbehci/hardware.h trunk/reactos/drivers/usb/usbehci/interfaces.h trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -222,6 +222,7 @@ ULONG PhysicalAddr; LIST_ENTRY LinkedQueueHeads; LIST_ENTRY TransferDescriptorListHead; + PVOID NextQueueHead; PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; @@ -309,4 +310,19 @@ ULONG PortChange; }EHCI_PORT_STATUS; - +#define EHCI_INTERRUPT_ENTRIES_COUNT (10 + 1) +#define EHCI_VFRAMELIST_ENTRIES_COUNT 128 +#define EHCI_FRAMELIST_ENTRIES_COUNT 1024 + +#define MAX_AVAILABLE_BANDWIDTH 125 // Microseconds + +#define EHCI_QH_CAPS_MULT_SHIFT 30 // Transactions per Micro-Frame +#define EHCI_QH_CAPS_MULT_MASK 0x03 +#define EHCI_QH_CAPS_PORT_SHIFT 23 // Hub Port (Split-Transaction) +#define EHCI_QH_CAPS_PORT_MASK 0x7f +#define EHCI_QH_CAPS_HUB_SHIFT 16 // Hub Address (Split-Transaction) +#define EHCI_QH_CAPS_HUB_MASK 0x7f +#define EHCI_QH_CAPS_SCM_SHIFT 8 // Split Completion Mask +#define EHCI_QH_CAPS_SCM_MASK 0xff +#define EHCI_QH_CAPS_ISM_SHIFT 0 // Interrupt Schedule Mask +#define EHCI_QH_CAPS_ISM_MASK 0xff Modified: trunk/reactos/drivers/usb/usbehci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -86,8 +86,11 @@ IN struct _QUEUE_HEAD * QueueHead) PURE; \ \ STDMETHOD_(BOOLEAN, IsQueueHeadComplete)( THIS_ \ - IN struct _QUEUE_HEAD * QueueHead) PURE; - + IN struct _QUEUE_HEAD * QueueHead) PURE; \ + \ + STDMETHOD_(USB_DEVICE_SPEED, GetSpeed)( THIS) PURE; \ + \ + STDMETHOD_(UCHAR, GetInterval)( THIS) PURE; #define IMP_IEHCIREQUEST \ STDMETHODIMP_(VOID) CompletionCallback( \ @@ -103,8 +106,11 @@ STDMETHODIMP_(VOID) FreeQueueHead(struct _QUEUE_HEAD * QueueHead); \ \ STDMETHODIMP_(BOOLEAN) IsQueueHeadComplete( \ - IN struct _QUEUE_HEAD * QueueHead); - + IN struct _QUEUE_HEAD * QueueHead); \ + \ + STDMETHODIMP_(USB_DEVICE_SPEED) GetSpeed( THIS); \ + \ + STDMETHODIMP_(UCHAR) GetInterval( THIS); DECLARE_INTERFACE_(IEHCIRequest, IUSBRequest) { Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -55,7 +55,6 @@ ULONG m_MaxPollingInterval; // max polling interval PHYSICAL_ADDRESS m_SyncFrameListAddr; // physical address of sync frame list PULONG m_SyncFrameList; // virtual address of sync frame list - PQUEUE_HEAD * m_SyncFrameListQueueHeads; // stores the frame list of queue head // queue head manipulation functions VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); @@ -66,6 +65,9 @@ // processes the async list VOID ProcessAsyncList(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + // processes the async list + VOID ProcessPeriodicSchedule(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + // called for each completed queue head VOID QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); @@ -74,6 +76,14 @@ // intializes the sync schedule NTSTATUS InitializeSyncSchedule(IN PEHCIHARDWAREDEVICE Hardware, IN PDMAMEMORYMANAGER MemManager); + + // links interrupt queue head + VOID LinkInterruptQueueHead(PQUEUE_HEAD QueueHead); + + // interrupt queue heads + PQUEUE_HEAD m_InterruptQueueHeads[EHCI_INTERRUPT_ENTRIES_COUNT]; + + }; //================================================================================================= @@ -156,7 +166,7 @@ { PHYSICAL_ADDRESS QueueHeadPhysAddr; NTSTATUS Status; - ULONG Index; + ULONG Index, Interval, IntervalIndex; PQUEUE_HEAD QueueHead; // @@ -165,23 +175,10 @@ m_MaxPeriodicListEntries = 1024; // - // use polling scheme of 32ms - // - m_MaxPollingInterval = 32; - - // - // allocate dummy frame list array - // - m_SyncFrameListQueueHeads = (PQUEUE_HEAD*)ExAllocatePool(NonPagedPool, m_MaxPollingInterval * sizeof(PQUEUE_HEAD)); - if (!m_SyncFrameListQueueHeads) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } - - + // use polling scheme of 512ms + // + m_MaxPollingInterval = 512; + // // first allocate a page to hold the queue array // @@ -192,77 +189,52 @@ // failed to allocate sync frame list array // DPRINT1("Failed to allocate sync frame list\n"); - ExFreePool(m_SyncFrameListQueueHeads); - //ASSERT(FALSE); return STATUS_INSUFFICIENT_RESOURCES; } - // - // now allocate queue head descriptors for the polling interval - // - for(Index = 0; Index < m_MaxPeriodicListEntries; Index++) - { - // - // check if is inside our polling interrupt frequency window - // - if (Index < m_MaxPollingInterval) + for(Index = 0; Index < EHCI_INTERRUPT_ENTRIES_COUNT; Index++) + { + // + // allocate queue head + // + Status = MemManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysAddr); + + // + // initialize queue head + // + QueueHead->HorizontalLinkPointer = TERMINATE_POINTER; + QueueHead->AlternateNextPointer = TERMINATE_POINTER; + QueueHead->NextPointer = TERMINATE_POINTER; + QueueHead->EndPointCharacteristics.MaximumPacketLength = 64; + QueueHead->EndPointCharacteristics.NakCountReload = 0x3; + QueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; + QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x01; + QueueHead->PhysicalAddr = QueueHeadPhysAddr.LowPart; + QueueHead->Token.Bits.Halted = TRUE; //FIXME + m_InterruptQueueHeads[Index]= QueueHead; + + if (Index > 0) { - // - // allocate queue head - // - Status = MemManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysAddr); - - // - // initialize queue head - // - QueueHead->HorizontalLinkPointer = TERMINATE_POINTER; - QueueHead->AlternateNextPointer = TERMINATE_POINTER; - QueueHead->NextPointer = TERMINATE_POINTER; - - // - // 1 for non high speed, 0 for high speed device - // - QueueHead->EndPointCharacteristics.ControlEndPointFlag = 0; - QueueHead->EndPointCharacteristics.HeadOfReclamation = FALSE; - QueueHead->EndPointCharacteristics.MaximumPacketLength = 64; - - // - // Set NakCountReload to max value possible - // - QueueHead->EndPointCharacteristics.NakCountReload = 0xF; - - // - // Get the Initial Data Toggle from the QEDT - // - QueueHead->EndPointCharacteristics.QEDTDataToggleControl = FALSE; - - // - // FIXME: check if High Speed Device - // - QueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; - QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x03; - QueueHead->Token.DWord = 0; - QueueHead->Token.Bits.InterruptOnComplete = FALSE; - QueueHead->PhysicalAddr = QueueHeadPhysAddr.LowPart; - - - // - // store in queue head array - // - m_SyncFrameListQueueHeads[Index] = QueueHead; + // link all to the first queue head + QueueHead->HorizontalLinkPointer = m_InterruptQueueHeads[0]->PhysicalAddr | QH_TYPE_QH; + QueueHead->NextQueueHead = m_InterruptQueueHeads[0]; } - else + } + + // + // build interrupt tree + // + Interval = EHCI_FRAMELIST_ENTRIES_COUNT; + IntervalIndex = EHCI_INTERRUPT_ENTRIES_COUNT - 1; + while (Interval > 1) + { + for (Index = Interval / 2; Index < EHCI_FRAMELIST_ENTRIES_COUNT; Index += Interval) { - // - // get cached entry - // - QueueHead = m_SyncFrameListQueueHeads[m_MaxPeriodicListEntries % m_MaxPollingInterval]; + DPRINT("Index %lu IntervalIndex %lu\n", Index, IntervalIndex); + m_SyncFrameList[Index] = m_InterruptQueueHeads[IntervalIndex]->PhysicalAddr | QH_TYPE_QH; } - - // - // store entry - // - m_SyncFrameList[Index] = (QueueHead->PhysicalAddr | 0x2); + IntervalIndex--; + Interval /= 2; } // @@ -293,21 +265,17 @@ // get internal req Request = PEHCIREQUEST(Req); - // // get request type - // Type = Request->GetTransferType(); - // // check if supported - // switch(Type) { case USB_ENDPOINT_TYPE_ISOCHRONOUS: - case USB_ENDPOINT_TYPE_INTERRUPT: /* NOT IMPLEMENTED IN QUEUE */ Status = STATUS_NOT_SUPPORTED; break; + case USB_ENDPOINT_TYPE_INTERRUPT: case USB_ENDPOINT_TYPE_BULK: case USB_ENDPOINT_TYPE_CONTROL: Status = STATUS_SUCCESS; @@ -318,53 +286,45 @@ Status = STATUS_NOT_SUPPORTED; } - // // check for success - // if (!NT_SUCCESS(Status)) { - // // request not supported, please try later - // return Status; } + // get queue head + Status = Request->GetQueueHead(&QueueHead); + + // check for success + if (!NT_SUCCESS(Status)) + { + // failed to get queue head + return Status; + } + + // acquire lock + KeAcquireSpinLock(m_Lock, &OldLevel); + if (Type == USB_ENDPOINT_TYPE_BULK || Type == USB_ENDPOINT_TYPE_CONTROL) { - // - // get queue head - // - Status = Request->GetQueueHead(&QueueHead); - - // - // check for success - // - if (!NT_SUCCESS(Status)) - { - // - // failed to get queue head - // - return Status; - } - - DPRINT("Request %p QueueHead %p inserted into AsyncQueue\n", Request, QueueHead); - - // - // Add it to the pending list - // - KeAcquireSpinLock(m_Lock, &OldLevel); + // Add to list LinkQueueHead(AsyncListQueueHead, QueueHead); - KeReleaseSpinLock(m_Lock, OldLevel); - - } - - - // + } + else if (Type == USB_ENDPOINT_TYPE_INTERRUPT) + { + // get interval + LinkInterruptQueueHead(QueueHead); + } + + // release lock + KeReleaseSpinLock(m_Lock, OldLevel); + + // add extra reference which is released when the request is completed - // Request->AddRef(); - + // done return STATUS_SUCCESS; } @@ -385,6 +345,79 @@ } return Status; +} + +VOID +CUSBQueue::LinkInterruptQueueHead( + PQUEUE_HEAD QueueHead) +{ + PEHCIREQUEST Request; + UCHAR Interval, IntervalIndex; + USB_DEVICE_SPEED DeviceSpeed; + PQUEUE_HEAD InterruptQueueHead; + + // get internal req + Request = PEHCIREQUEST(QueueHead->Request); + ASSERT(Request); + + // get interval + Interval = Request->GetInterval(); + + // get device speed + DeviceSpeed = Request->GetSpeed(); + if (DeviceSpeed == UsbHighSpeed) + { + // interrupt queue head can be scheduled on each possible micro frame + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0xFF; + } + else + { + // As we do not yet support FSTNs to correctly reference low/full + // speed interrupt transfers, we simply put them into the 1 interval + // queue. This way we ensure that we reach them on every micro frame + // and can do the corresponding start/complete split transactions. + // ToDo: use FSTNs to correctly link non high speed interrupt transfers + Interval = 1; + + // For now we also force start splits to be in micro frame 0 and + // complete splits to be in micro frame 2, 3 and 4. + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x01; + QueueHead->EndPointCapabilities.SplitCompletionMask = 0x1C; + } + + // sanitize interrupt interval + Interval = max(1, Interval); + + if (Interval == 1) + IntervalIndex = 1; + else if (Interval == 2) + IntervalIndex = 2; + else if (Interval <= 4) + IntervalIndex = 3; + else if (Interval <= 8) + IntervalIndex = 4; + else if (Interval <= 16) + IntervalIndex = 5; + else if (Interval <= 32) + IntervalIndex = 6; + else if (Interval <= 64) + IntervalIndex = 7; + else if (Interval <= 128) + IntervalIndex = 8; + else if (Interval <= 256) + IntervalIndex = 9; + else + IntervalIndex = 10; + + // get interrupt queue head + InterruptQueueHead = m_InterruptQueueHeads[IntervalIndex]; + + // link queue head + QueueHead->HorizontalLinkPointer = InterruptQueueHead->HorizontalLinkPointer; + QueueHead->NextQueueHead = InterruptQueueHead->NextQueueHead; + + InterruptQueueHead->HorizontalLinkPointer = QueueHead->PhysicalAddr | QH_TYPE_QH; + InterruptQueueHead->NextQueueHead = QueueHead; } // @@ -583,6 +616,16 @@ InsertTailList(&m_CompletedRequestAsyncList, &CurrentQH->LinkedQueueHeads); } + +VOID +CUSBQueue::ProcessPeriodicSchedule( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + + +} + VOID CUSBQueue::ProcessAsyncList( IN NTSTATUS Status, @@ -665,18 +708,18 @@ IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell) { - DPRINT("CUSBQueue::InterruptCallback\n"); + + // + // process periodic schedule + // + ProcessPeriodicSchedule(Status, ShouldRingDoorBell); // // iterate asynchronous list // *ShouldRingDoorBell = FALSE; ProcessAsyncList(Status, ShouldRingDoorBell); - - // - // TODO: implement periodic schedule processing - // } VOID Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -44,7 +44,7 @@ ULONG InternalGetTransferType(); UCHAR InternalGetPidDirection(); NTSTATUS BuildControlTransferQueueHead(PQUEUE_HEAD * OutHead); - NTSTATUS BuildBulkTransferQueueHead(PQUEUE_HEAD * OutHead); + NTSTATUS BuildBulkInterruptTransferQueueHead(PQUEUE_HEAD * OutHead); NTSTATUS STDMETHODCALLTYPE CreateDescriptor(PQUEUE_TRANSFER_DESCRIPTOR *OutDescriptor); NTSTATUS CreateQueueHead(PQUEUE_HEAD *OutQueueHead); UCHAR STDMETHODCALLTYPE GetDeviceAddress(); @@ -129,7 +129,11 @@ NTSTATUS m_NtStatusCode; ULONG m_UrbStatusCode; + // buffer base address PVOID m_Base; + + // device speed + USB_DEVICE_SPEED m_Speed; }; @@ -168,6 +172,7 @@ m_TransferBufferLength = TransferBufferLength; m_TransferBufferMDL = TransferBuffer; m_DeviceAddress = Device->GetDeviceAddress(); + m_Speed = Device->GetSpeed(); m_EndpointDescriptor = EndpointDescriptor; m_TotalBytesTransferred = 0; @@ -217,6 +222,7 @@ m_DmaManager = DmaManager; m_TotalBytesTransferred = 0; + m_Speed = Device->GetSpeed(); // // get current irp stack location @@ -442,12 +448,9 @@ case USB_ENDPOINT_TYPE_CONTROL: Status = BuildControlTransferQueueHead(OutHead); break; + case USB_ENDPOINT_TYPE_INTERRUPT: case USB_ENDPOINT_TYPE_BULK: - Status = BuildBulkTransferQueueHead(OutHead); - break; - case USB_ENDPOINT_TYPE_INTERRUPT: - DPRINT1("USB_ENDPOINT_TYPE_INTERRUPT not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = BuildBulkInterruptTransferQueueHead(OutHead); break; case USB_ENDPOINT_TYPE_ISOCHRONOUS: DPRINT1("USB_ENDPOINT_TYPE_ISOCHRONOUS not implemented\n"); @@ -1059,7 +1062,7 @@ //---------------------------------------------------------------------------------------- NTSTATUS -CUSBRequest::BuildBulkTransferQueueHead( +CUSBRequest::BuildBulkInterruptTransferQueueHead( PQUEUE_HEAD * OutHead) { NTSTATUS Status; @@ -1738,6 +1741,21 @@ return m_TransferBufferLength; } +USB_DEVICE_SPEED +CUSBRequest::GetSpeed() +{ + return m_Speed; +} + +UCHAR +CUSBRequest::GetInterval() +{ + if (!m_EndpointDescriptor) + return 0; + + return m_EndpointDescriptor->EndPointDescriptor.bInterval; +} + //----------------------------------------------------------------------------------------- NTSTATUS NTAPI

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