Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[janderwald] 55197: [USBCCGP] - Query bus interface and check if USBC_DEVICE_CONFIGURATION_INTERFACE_V1 is supported. This interface is implemented by attached usb filter drivers and is used to enu...
by janderwald＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: janderwald Date: Thu Jan 26 13:45:59 2012 New Revision: 55197 URL: http://svn.reactos.org/svn/reactos?rev=55197&view=rev Log: [USBCCGP] - Query bus interface and check if USBC_DEVICE_CONFIGURATION_INTERFACE_V1 is supported. This interface is implemented by attached usb filter drivers and is used to enumerate functions of the composite usb device - Implement enumeration of function by using usb interface association descriptors and by the USBC_DEVICE_CONFIGURATION_INTERFACE_V1 - Needs audio legacy method and union function descriptors to be fully functional - WIP, not yet tested - Fix build with mingw by declaring _DISK_GEOMETRY_EX outside the function Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c (with props) Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h branches/usb-bringup-trunk/include/ddk/ntddk.h Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -1,9 +1,12 @@ +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + add_definitions(-DDEBUG_MODE) include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbccgp SHARED descriptor.c fdo.c misc.c pdo.c usbccgp.c usbccgp.rc) +add_library(usbccgp SHARED descriptor.c fdo.c function.c misc.c pdo.c usbccgp.c usbccgp.rc) target_link_libraries(usbccgp ${PSEH_LIB}) Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -187,9 +187,26 @@ return Status; } - // - // FIXME: parse usb interface association descriptor - // and create PDO for each function + // query bus interface + USBCCGP_QueryInterface(FDODeviceExtension->NextDeviceObject, &FDODeviceExtension->BusInterface); + + // now enumerate the functions + Status = USBCCGP_EnumerateFunctions(DeviceObject); + if (!NT_SUCCESS(Status)) + { + // failed to enumerate functions + DPRINT1("Failed to enumerate functions with %x\n", Status); + return Status; + } + + // + // sanity checks + // + ASSERT(FDODeviceExtension->FunctionDescriptorCount); + ASSERT(FDODeviceExtension->FunctionDescriptor); + + // + // FIXME:create PDO for each function // ASSERT(FALSE); return Status; Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -1,0 +1,580 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbccgp/descriptor.c + * PURPOSE: USB device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Cameron Gutman + */ + +#include "usbccgp.h" + +NTSTATUS +USBCCGP_QueryInterface( + IN PDEVICE_OBJECT DeviceObject, + OUT PUSBC_DEVICE_CONFIGURATION_INTERFACE_V1 BusInterface) +{ + KEVENT Event; + NTSTATUS Status; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION Stack; + + // + // sanity checks + // + ASSERT(DeviceObject); + + // + // initialize event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // init interface + // + RtlZeroMemory(BusInterface, sizeof(USBC_DEVICE_CONFIGURATION_INTERFACE_V1)); + BusInterface->Version = USBC_DEVICE_CONFIGURATION_INTERFACE_VERSION_1; + BusInterface->Size = sizeof(USBC_DEVICE_CONFIGURATION_INTERFACE_V1); + + // + // create irp + // + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatus); + + // + // was irp built + // + if (Irp == NULL) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize request + // + Stack=IoGetNextIrpStackLocation(Irp); + Stack->MajorFunction = IRP_MJ_PNP; + Stack->MinorFunction = IRP_MN_QUERY_INTERFACE; + Stack->Parameters.QueryInterface.Size = sizeof(BUS_INTERFACE_STANDARD); + Stack->Parameters.QueryInterface.InterfaceType = (LPGUID)&USB_BUS_INTERFACE_USBC_CONFIGURATION_GUID; + Stack->Parameters.QueryInterface.Version = 2; + Stack->Parameters.QueryInterface.Interface = (PINTERFACE)&BusInterface; + Stack->Parameters.QueryInterface.InterfaceSpecificData = NULL; + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + // + // call driver + // + Status= IoCallDriver(DeviceObject, Irp); + + // + // did operation complete + // + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // collect status + // + Status = IoStatus.Status; + } + + return Status; +} + +NTSTATUS +USBCCGP_CustomEnumWithInterface( + IN PDEVICE_OBJECT DeviceObject) +{ + PFDO_DEVICE_EXTENSION FDODeviceExtension; + ULONG FunctionDescriptorBufferLength = 0; + NTSTATUS Status; + PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptorBuffer = NULL; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + if (FDODeviceExtension->BusInterface.StartDeviceCallback == NULL) + { + // + // not supported + // + return STATUS_NOT_SUPPORTED; + } + + // + // invoke callback + // + Status = FDODeviceExtension->BusInterface.StartDeviceCallback(FDODeviceExtension->DeviceDescriptor, + FDODeviceExtension->ConfigurationDescriptor, + &FunctionDescriptorBuffer, + &FunctionDescriptorBufferLength, + DeviceObject, + FDODeviceExtension->PhysicalDeviceObject); + + DPRINT1("USBCCGP_CustomEnumWithInterface Status %x\n", Status); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + DPRINT1("FunctionDescriptorBufferLength %lu\n", FunctionDescriptorBufferLength); + DPRINT1("FunctionDescriptorBuffer %p\n", FunctionDescriptorBuffer); + + // + // assume length % function buffer size + // + ASSERT(FunctionDescriptorBufferLength); + ASSERT(FunctionDescriptorBufferLength % sizeof(USBC_FUNCTION_DESCRIPTOR) == 0); + + // + // store result + // + FDODeviceExtension->FunctionDescriptor = FunctionDescriptorBuffer; + FDODeviceExtension->FunctionDescriptorCount = FunctionDescriptorBufferLength / sizeof(USBC_FUNCTION_DESCRIPTOR); + + // + // success + // + return STATUS_SUCCESS; +} + +ULONG +USBCCGP_CountAssociationDescriptors( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR Descriptor; + PUCHAR Offset, End; + ULONG Count = 0; + + // + // init offsets + // + Offset = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->bLength; + End = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength; + + while(Offset < End) + { + // + // get association descriptor + // + Descriptor = (PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR)Offset; + + if (Descriptor->bLength == sizeof(USB_INTERFACE_ASSOCIATION_DESCRIPTOR) && Descriptor->bDescriptorType == USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE) + { + // + // found descriptor + // + Count++; + } + + // + // move to next descriptor + // + Offset += Descriptor->bLength; + } + + // + // done + // + return Count; +} + +PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR +USBCCGP_GetAssociationDescriptorAtIndex( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN ULONG Index) +{ + PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR Descriptor; + PUCHAR Offset, End; + ULONG Count = 0; + + // + // init offsets + // + Offset = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->bLength; + End = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength; + + while(Offset < End) + { + // + // get association descriptor + // + Descriptor = (PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR)Offset; + + if (Descriptor->bLength == sizeof(USB_INTERFACE_ASSOCIATION_DESCRIPTOR) && Descriptor->bDescriptorType == USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE) + { + if (Index == Count) + { + // + // found descriptor + // + return Descriptor; + } + + // + // not the searched one + // + Count++; + } + + // + // move to next descriptor + // + Offset += Descriptor->bLength; + } + + // + // failed to find descriptor at the specified index + // + return NULL; +} + +NTSTATUS +USBCCGP_InitInterfaceListOfFunctionDescriptor( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR AssociationDescriptor, + OUT PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptor) +{ + PUSB_INTERFACE_DESCRIPTOR Descriptor; + PUCHAR Offset, End; + ULONG Count = 0; + + // + // init offsets + // + Offset = (PUCHAR)AssociationDescriptor + AssociationDescriptor->bLength; + End = (PUCHAR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength; + + while(Offset < End) + { + // + // get association descriptor + // + Descriptor = (PUSB_INTERFACE_DESCRIPTOR)Offset; + + if (Descriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR) && Descriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) + { + // + // store interface descriptor + // + FunctionDescriptor->InterfaceDescriptorList[Count] = Descriptor; + Count++; + + if (Count == AssociationDescriptor->bInterfaceCount) + { + // + // got all interfaces + // + return STATUS_SUCCESS; + } + } + + if (Descriptor->bLength == sizeof(USB_INTERFACE_ASSOCIATION_DESCRIPTOR) && Descriptor->bDescriptorType == USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE) + { + // + // WTF? a association descriptor which overlaps the next association descriptor + // + DPRINT1("Invalid association descriptor\n"); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + // + // move to next descriptor + // + Offset += Descriptor->bLength; + } + + // + // invalid association descriptor + // + DPRINT1("Invalid association descriptor\n"); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +USBCCGP_InitFunctionDescriptor( + IN PFDO_DEVICE_EXTENSION FDODeviceExtension, + IN ULONG FunctionNumber, + OUT PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptor) +{ + PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR Descriptor; + NTSTATUS Status; + LPWSTR DescriptionBuffer; + WCHAR Buffer[100]; + ULONG Index; + + // init function number + FunctionDescriptor->FunctionNumber = (UCHAR)FunctionNumber; + + // get association descriptor + Descriptor = USBCCGP_GetAssociationDescriptorAtIndex(FDODeviceExtension->ConfigurationDescriptor, FunctionNumber); + ASSERT(Descriptor); + + // store number interfaces + FunctionDescriptor->NumberOfInterfaces = Descriptor->bInterfaceCount; + + // allocate array for interface count + FunctionDescriptor->InterfaceDescriptorList = AllocateItem(NonPagedPool, sizeof(PUSB_INTERFACE_DESCRIPTOR) * Descriptor->bInterfaceCount); + if (FunctionDescriptor->InterfaceDescriptorList) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // init interface list + Status = USBCCGP_InitInterfaceListOfFunctionDescriptor(FDODeviceExtension->ConfigurationDescriptor, Descriptor, FunctionDescriptor); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // now init interface description + // + if (Descriptor->iFunction) + { + // + // get interface description + // + Status = USBCCGP_GetDescriptor(FDODeviceExtension->NextDeviceObject, + USB_STRING_DESCRIPTOR_TYPE, + 100 * sizeof(WCHAR), + Descriptor->iFunction, + 0x0409, //FIXME + (PVOID*)&DescriptionBuffer); + if (!NT_SUCCESS(Status)) + { + // + // no description + // + RtlInitUnicodeString(&FunctionDescriptor->FunctionDescription, L""); + } + else + { + // + // init description + // + RtlInitUnicodeString(&FunctionDescriptor->FunctionDescription, DescriptionBuffer); + } + DPRINT1("FunctionDescription %wZ\n", &FunctionDescriptor->FunctionDescription); + } + + // + // now init hardware id + // + Index = swprintf(Buffer, L"USB\\VID_%04x&PID_%04x&Rev_%04x&MI_%02x", FDODeviceExtension->DeviceDescriptor->idVendor, + FDODeviceExtension->DeviceDescriptor->idProduct, + FDODeviceExtension->DeviceDescriptor->bcdDevice, + Descriptor->bFirstInterface) + 1; + Index = swprintf(&Buffer[Index], L"USB\\VID_%04x&PID_%04x&MI_%02x", FDODeviceExtension->DeviceDescriptor->idVendor, + FDODeviceExtension->DeviceDescriptor->idProduct, + Descriptor->bFirstInterface) + 1; + + // allocate result buffer + DescriptionBuffer = AllocateItem(NonPagedPool, (Index + 1) * sizeof(WCHAR)); + if (!DescriptionBuffer) + { + // + // failed to allocate memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // copy description + RtlCopyMemory(DescriptionBuffer, Buffer, Index * sizeof(WCHAR)); + RtlInitUnicodeString(&FunctionDescriptor->HardwareId, DescriptionBuffer); + + // + // now init the compatible id + // + Index = swprintf(Buffer, L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", Descriptor->bFunctionClass, Descriptor->bFunctionSubClass, Descriptor->bFunctionProtocol) + 1; + Index = swprintf(&Buffer[Index], L"USB\\Class_%04x&SubClass_%04x", Descriptor->bFunctionClass, Descriptor->bFunctionSubClass) + 1; + Index = swprintf(&Buffer[Index], L"USB\\Class_%04x", Descriptor->bFunctionClass) + 1; + + // allocate result buffer + DescriptionBuffer = AllocateItem(NonPagedPool, (Index + 1) * sizeof(WCHAR)); + if (!DescriptionBuffer) + { + // + // failed to allocate memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // copy description + // copy description + RtlCopyMemory(DescriptionBuffer, Buffer, Index * sizeof(WCHAR)); + RtlInitUnicodeString(&FunctionDescriptor->CompatibleId, DescriptionBuffer); + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +USBCCGP_EnumWithAssociationDescriptor( + IN PDEVICE_OBJECT DeviceObject) +{ + ULONG DescriptorCount, Index; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + NTSTATUS Status = STATUS_SUCCESS; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // count association descriptors + // + DescriptorCount = USBCCGP_CountAssociationDescriptors(FDODeviceExtension->ConfigurationDescriptor); + if (!DescriptorCount) + { + // + // no descriptors found + // + return STATUS_NOT_SUPPORTED; + } + + // + // allocate function descriptor array + // + FDODeviceExtension->FunctionDescriptor = AllocateItem(NonPagedPool, sizeof(USBC_FUNCTION_DESCRIPTOR) * DescriptorCount); + if (!FDODeviceExtension->FunctionDescriptorCount) + { + // + // no memory + // + DPRINT1("USBCCGP_EnumWithAssociationDescriptor failed to allocate function descriptor count %x\n", DescriptorCount); + return STATUS_INSUFFICIENT_RESOURCES; + } + + for(Index = 0; Index < DescriptorCount; Index++) + { + // + // init function descriptors + // + Status = USBCCGP_InitFunctionDescriptor(FDODeviceExtension, Index, &FDODeviceExtension->FunctionDescriptor[Index]); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + } + + // + // store function descriptor count + // + FDODeviceExtension->FunctionDescriptorCount = DescriptorCount; + + // + // done + // + return Status; +} + + +NTSTATUS +USBCCGP_EnumWithAudioLegacy( + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +USBCCGP_EnumWithUnionFunctionDescriptors( + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +USBCCGP_EnumerateFunctions( + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // first try with filter driver + // + Status = USBCCGP_CustomEnumWithInterface(DeviceObject); + if (NT_SUCCESS(Status)) + { + // + // succeeded + // + return Status; + } + + // + // enumerate functions with interface association descriptor + // + Status = USBCCGP_EnumWithAssociationDescriptor(DeviceObject); + if (NT_SUCCESS(Status)) + { + // + // succeeded + // + return Status; + } + + // + // try with union function descriptors + // + Status = USBCCGP_EnumWithUnionFunctionDescriptors(DeviceObject); + if (NT_SUCCESS(Status)) + { + // + // succeeded + // + return Status; + } + + // + // try with legacy audio methods + // + return USBCCGP_EnumWithAudioLegacy(DeviceObject); +} Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -1,0 +1,197 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbccgp/misc.c + * PURPOSE: USB device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Cameron Gutman + */ + +#include "usbccgp.h" + +// +// driver verifier +// +IO_COMPLETION_ROUTINE SyncForwardIrpCompletionRoutine; + +NTSTATUS +NTAPI +USBSTOR_SyncForwardIrpCompletionRoutine( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) +{ + if (Irp->PendingReturned) + { + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + } + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +USBCCGP_SyncForwardIrp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + + // + // initialize event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // copy irp stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, USBSTOR_SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + + // + // call driver + // + Status = IoCallDriver(DeviceObject, Irp); + + // + // check if pending + // + if (Status == STATUS_PENDING) + { + // + // wait for the request to finish + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // copy status code + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + +NTSTATUS +USBCCGP_SyncUrbRequest( + IN PDEVICE_OBJECT DeviceObject, + OUT PURB UrbRequest) +{ + PIRP Irp; + PIO_STACK_LOCATION IoStack; + KEVENT Event; + NTSTATUS Status; + + // + // allocate irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // initialize stack location + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + IoStack->Parameters.Others.Argument1 = (PVOID)UrbRequest; + IoStack->Parameters.DeviceIoControl.InputBufferLength = UrbRequest->UrbHeader.Length; + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // setup completion routine + // + IoSetCompletionRoutine(Irp, USBSTOR_SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + // + // call driver + // + Status = IoCallDriver(DeviceObject, Irp); + + // + // check if request is pending + // + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // update status + // + Status = Irp->IoStatus.Status; + } + + // + // free irp + // + IoFreeIrp(Irp); + + // + // done + // + return Status; +} + +PVOID +AllocateItem( + IN POOL_TYPE PoolType, + IN ULONG ItemSize) +{ + // + // allocate item + // + PVOID Item = ExAllocatePoolWithTag(PoolType, ItemSize, USBCCPG_TAG); + + if (Item) + { + // + // zero item + // + RtlZeroMemory(Item, ItemSize); + } + + // + // return element + // + return Item; +} + +VOID +FreeItem( + IN PVOID Item) +{ + // + // free item + // + ExFreePoolWithTag(Item, USBCCPG_TAG); +} + Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbccgp/fdo.c + * FILE: drivers/usb/usbccgp/pdo.c * PURPOSE: USB device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbccgp/fdo.c + * FILE: drivers/usb/usbccgp/usbccgp.c * PURPOSE: USB device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -4,6 +4,7 @@ #include <ntddk.h> #define YDEBUG #include <debug.h> +#include <initguid.h> #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h> @@ -34,6 +35,9 @@ PUSBD_INTERFACE_LIST_ENTRY InterfaceList; // interface list ULONG InterfaceListCount; // interface list count USBD_CONFIGURATION_HANDLE ConfigurationHandle; // configuration handle + USBC_DEVICE_CONFIGURATION_INTERFACE_V1 BusInterface; // bus custom enumeration interface + PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptor; // usb function descriptor + ULONG FunctionDescriptorCount; // number of function descriptor }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; #define USBCCPG_TAG 'cbsu' @@ -54,6 +58,16 @@ USBCCGP_SelectConfiguration( IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension); + +NTSTATUS +NTAPI +USBCCGP_GetDescriptor( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR DescriptorType, + IN ULONG DescriptorLength, + IN UCHAR DescriptorIndex, + IN LANGID LanguageId, + OUT PVOID *OutDescriptor); /* misc.c */ @@ -91,6 +105,15 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp); +/* function.c */ +NTSTATUS +USBCCGP_QueryInterface( + IN PDEVICE_OBJECT DeviceObject, + OUT PUSBC_DEVICE_CONFIGURATION_INTERFACE_V1 BusInterface); + +NTSTATUS +USBCCGP_EnumerateFunctions( + IN PDEVICE_OBJECT DeviceObject); #endif Modified: branches/usb-bringup-trunk/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/n… ============================================================================== --- branches/usb-bringup-trunk/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/include/ddk/ntddk.h [iso-8859-1] Thu Jan 26 13:45:59 2012 @@ -4158,6 +4158,9 @@ #endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */ #if (NTDDI_VERSION >= NTDDI_VISTA) + +struct _DISK_GEOMETRY_EX; + NTKERNELAPI NTSTATUS NTAPI

1 0

[cgutman] 55196: [USBOHCI] - Wait the required time for the port to be ready after powering it up
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 04:35:04 2012 New Revision: 55196 URL: http://svn.reactos.org/svn/reactos?rev=55196&view=rev Log: [USBOHCI] - Wait the required time for the port to be ready after powering it up Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Thu Jan 26 04:35:04 2012 @@ -1266,10 +1266,39 @@ } else if (Feature == PORT_POWER) { + LARGE_INTEGER Timeout; + // // enable power // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PPS); + + // + // read descriptor A for the delay data + // + Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); + + // + // compute the delay + // + Timeout.QuadPart = OHCI_RH_GET_POWER_ON_TO_POWER_GOOD_TIME(Value); + + // + // delay is multiplied by 2 ms + // + Timeout.QuadPart *= 2; + DPRINT1("Waiting %d milliseconds for port power up\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + return STATUS_SUCCESS; } else if (Feature == PORT_SUSPEND)

1 0

[janderwald] 55195: [USBCCGP] - Start implement USB Composite generic parent driver which is used for USB composite devices - Start implement FDO initialization, needs to implement parsing of usb i...
by janderwald＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: janderwald Date: Thu Jan 26 03:42:56 2012 New Revision: 55195 URL: http://svn.reactos.org/svn/reactos?rev=55195&view=rev Log: [USBCCGP] - Start implement USB Composite generic parent driver which is used for USB composite devices - Start implement FDO initialization, needs to implement parsing of usb interface assocaition descriptor to complete FDO initialization Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/ (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c - copied, changed from r55188, branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rc (with props) Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/C… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,3 +1,4 @@ +add_subdirectory(usbccgp) add_subdirectory(usbd) add_subdirectory(usbehci_new) add_subdirectory(usbhub_new) Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Jan 26 03:42:56 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,0 +1,13 @@ + +add_definitions(-DDEBUG_MODE) + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_library(usbccgp SHARED descriptor.c fdo.c misc.c pdo.c usbccgp.c usbccgp.rc) + +target_link_libraries(usbccgp ${PSEH_LIB}) + +set_module_type(usbccgp kernelmodedriver) +add_importlibs(usbccgp ntoskrnl hal usbd) + +add_cd_file(TARGET usbccgp DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Copied: branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c (from r55188, branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,19 +1,19 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Storage Driver + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbstor/descriptor.c - * PURPOSE: USB block storage device driver. + * FILE: drivers/usb/usbccgp/descriptor.c + * PURPOSE: USB device driver. * PROGRAMMERS: - * James Tabor * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Cameron Gutman */ -#include "usbstor.h" +#include "usbccgp.h" NTSTATUS NTAPI -USBSTOR_GetDescriptor( +USBCCGP_GetDescriptor( IN PDEVICE_OBJECT DeviceObject, IN UCHAR DescriptorType, IN ULONG DescriptorLength, @@ -73,7 +73,7 @@ // // submit urb // - Status = USBSTOR_SyncUrbRequest(DeviceObject, Urb); + Status = USBCCGP_SyncUrbRequest(DeviceObject, Urb); // // free urb @@ -96,7 +96,7 @@ NTSTATUS -USBSTOR_GetDescriptors( +USBCCGP_GetDescriptors( IN PDEVICE_OBJECT DeviceObject) { NTSTATUS Status; @@ -111,7 +111,7 @@ // // first get device descriptor // - Status = USBSTOR_GetDescriptor(DeviceExtension->LowerDeviceObject, USB_DEVICE_DESCRIPTOR_TYPE, sizeof(USB_DEVICE_DESCRIPTOR), 0, 0, (PVOID*)&DeviceExtension->DeviceDescriptor); + Status = USBCCGP_GetDescriptor(DeviceExtension->NextDeviceObject, USB_DEVICE_DESCRIPTOR_TYPE, sizeof(USB_DEVICE_DESCRIPTOR), 0, 0, (PVOID*)&DeviceExtension->DeviceDescriptor); if (!NT_SUCCESS(Status)) { // @@ -124,7 +124,7 @@ // // now get basic configuration descriptor // - Status = USBSTOR_GetDescriptor(DeviceExtension->LowerDeviceObject, USB_CONFIGURATION_DESCRIPTOR_TYPE, sizeof(USB_CONFIGURATION_DESCRIPTOR), 0, 0, (PVOID*)&DeviceExtension->ConfigurationDescriptor); + Status = USBCCGP_GetDescriptor(DeviceExtension->NextDeviceObject, USB_CONFIGURATION_DESCRIPTOR_TYPE, sizeof(USB_CONFIGURATION_DESCRIPTOR), 0, 0, (PVOID*)&DeviceExtension->ConfigurationDescriptor); if (!NT_SUCCESS(Status)) { // @@ -149,7 +149,7 @@ // // allocate full descriptor // - Status = USBSTOR_GetDescriptor(DeviceExtension->LowerDeviceObject, USB_CONFIGURATION_DESCRIPTOR_TYPE, DescriptorLength, 0, 0, (PVOID*)&DeviceExtension->ConfigurationDescriptor); + Status = USBCCGP_GetDescriptor(DeviceExtension->NextDeviceObject, USB_CONFIGURATION_DESCRIPTOR_TYPE, DescriptorLength, 0, 0, (PVOID*)&DeviceExtension->ConfigurationDescriptor); if (!NT_SUCCESS(Status)) { // @@ -159,171 +159,65 @@ DeviceExtension->DeviceDescriptor = NULL; return Status; } - - // - // check if there is a serial number provided - // - if (DeviceExtension->DeviceDescriptor->iSerialNumber) - { - // - // get serial number - // - Status = USBSTOR_GetDescriptor(DeviceExtension->LowerDeviceObject, USB_STRING_DESCRIPTOR_TYPE, 100 * sizeof(WCHAR), DeviceExtension->DeviceDescriptor->iSerialNumber, 0x0409, (PVOID*)&DeviceExtension->SerialNumber); - if (!NT_SUCCESS(Status)) - { - // - // failed to get serial number descriptor, free device descriptor - // - FreeItem(DeviceExtension->DeviceDescriptor); - DeviceExtension->DeviceDescriptor = NULL; - - // - // free configuration descriptor - // - FreeItem(DeviceExtension->ConfigurationDescriptor); - DeviceExtension->ConfigurationDescriptor = NULL; - - // - // set serial number to zero - // - DeviceExtension->SerialNumber = NULL; - return Status; - } - } - return Status; } NTSTATUS NTAPI -USBSTOR_ScanConfigurationDescriptor( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, - OUT PUSB_INTERFACE_DESCRIPTOR * OutInterfaceDescriptor, - OUT PUSB_ENDPOINT_DESCRIPTOR * InEndpointDescriptor, - OUT PUSB_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor) -{ - PUSB_CONFIGURATION_DESCRIPTOR CurrentDescriptor; - PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; +USBCCGP_ScanConfigurationDescriptor( + IN OUT PFDO_DEVICE_EXTENSION FDODeviceExtension, + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + ULONG InterfaceIndex = 0; // // sanity checks // ASSERT(ConfigurationDescriptor); - ASSERT(OutInterfaceDescriptor); - ASSERT(InEndpointDescriptor); - ASSERT(OutEndpointDescriptor); - - // - // nullify pointers - // - *OutInterfaceDescriptor = NULL; - *InEndpointDescriptor = NULL; - *OutEndpointDescriptor = NULL; - - // - // start scanning - // - CurrentDescriptor = ConfigurationDescriptor; + ASSERT(ConfigurationDescriptor->bNumInterfaces); + + // + // allocate array holding the interface descriptors + // + FDODeviceExtension->InterfaceList = AllocateItem(NonPagedPool, sizeof(USB_CONFIGURATION_DESCRIPTOR) * (ConfigurationDescriptor->bNumInterfaces + 1)); + if (!FDODeviceExtension->InterfaceList) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } do { // - // check current descriptor type - // - if (CurrentDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) + // parse configuration descriptor + // + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, InterfaceIndex, 0, -1, -1, -1); + if (InterfaceDescriptor) { // - // found interface descriptor + // store in interface list // - if (*OutInterfaceDescriptor) - { - // - // we only process the first interface descriptor as ms does -> see documentation - // - break; - } - - // - // store interface descriptor - // - *OutInterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)CurrentDescriptor; + FDODeviceExtension->InterfaceList[FDODeviceExtension->InterfaceListCount].InterfaceDescriptor = InterfaceDescriptor; + FDODeviceExtension->InterfaceListCount++; } - else if (CurrentDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE) - { - // - // convert to endpoint descriptor - // - EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)CurrentDescriptor; - - // - // sanity check - // - ASSERT(*OutInterfaceDescriptor); - - // - // get endpoint type - // - if ((EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_BULK) - { - // - // bulk endpoint type - // - if (USB_ENDPOINT_DIRECTION_IN(EndpointDescriptor->bEndpointAddress)) - { - // - // bulk in - // - *InEndpointDescriptor = EndpointDescriptor; - } - else - { - // - // bulk out - // - *OutEndpointDescriptor = EndpointDescriptor; - } - } - else if ((EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT) - { - // - // interrupt endpoint type - // - UNIMPLEMENTED - } - } - - // - // move to next descriptor - // - CurrentDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)CurrentDescriptor + CurrentDescriptor->bLength); - - // - // was it the last descriptor - // - if ((ULONG_PTR)CurrentDescriptor >= ((ULONG_PTR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength)) - { - // - // reached last descriptor - // - break; - } - - }while(TRUE); - - // - // check if everything has been found - // - if (*OutInterfaceDescriptor == NULL || *InEndpointDescriptor == NULL || *OutEndpointDescriptor == NULL) - { - // - // failed to find interface / endpoint descriptor - // - DPRINT1("USBSTOR_ScanConfigurationDescriptor: Failed to find InterfaceDescriptor %p InEndpointDescriptor %p OutEndpointDescriptor %p\n", *OutInterfaceDescriptor, *InEndpointDescriptor, *OutEndpointDescriptor); - return STATUS_UNSUCCESSFUL; - } - - // - // completed successfully + + // + // move to next interface + // + InterfaceIndex++; + + }while(InterfaceIndex < ConfigurationDescriptor->bNumInterfaces); + + // + // sanity check + // + ASSERT(FDODeviceExtension->InterfaceListCount); + + // + // done // return STATUS_SUCCESS; } @@ -343,20 +237,78 @@ } NTSTATUS -USBSTOR_SelectConfigurationAndInterface( +USBCCGP_SelectInterface( + IN PDEVICE_OBJECT DeviceObject, + IN PFDO_DEVICE_EXTENSION DeviceExtension, + IN ULONG InterfaceIndex) +{ + NTSTATUS Status; + PURB Urb; + + // + // allocate urb + // + Urb = AllocateItem(NonPagedPool, sizeof(struct _URB_SELECT_INTERFACE)); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // now prepare interface urb + // + UsbBuildSelectInterfaceRequest(Urb, GET_SELECT_INTERFACE_REQUEST_SIZE(DeviceExtension->InterfaceList[InterfaceIndex].InterfaceDescriptor->bNumEndpoints), DeviceExtension->ConfigurationHandle, DeviceExtension->InterfaceList[InterfaceIndex].InterfaceDescriptor->bInterfaceNumber, DeviceExtension->InterfaceList[InterfaceIndex].InterfaceDescriptor->bAlternateSetting); + + // + // copy interface information structure back - as offset for SelectConfiguration / SelectInterface request do differ + // + RtlCopyMemory(&Urb->UrbSelectInterface.Interface, DeviceExtension->InterfaceList[InterfaceIndex].Interface, DeviceExtension->InterfaceList[InterfaceIndex].Interface->Length); + + // + // now select the interface + // + Status = USBCCGP_SyncUrbRequest(DeviceExtension->NextDeviceObject, Urb); + + // + // did it succeeed + // + if (NT_SUCCESS(Status)) + { + // + // update configuration info + // + ASSERT(Urb->UrbSelectInterface.Interface.Length == DeviceExtension->InterfaceList[InterfaceIndex].Interface->Length); + RtlCopyMemory(DeviceExtension->InterfaceList[InterfaceIndex].Interface, &Urb->UrbSelectInterface.Interface, Urb->UrbSelectInterface.Interface.Length); + } + + // + // free urb + // + FreeItem(Urb); + + // + // done + // + return Status; +} + +NTSTATUS +USBCCGP_SelectConfiguration( IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension) { - PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PUSB_ENDPOINT_DESCRIPTOR InEndpointDescriptor, OutEndpointDescriptor; + PUSBD_INTERFACE_INFORMATION InterfaceInformation; NTSTATUS Status; PURB Urb; - PUSBD_INTERFACE_LIST_ENTRY InterfaceList; + ULONG Index; // // now scan configuration descriptors // - Status = USBSTOR_ScanConfigurationDescriptor(DeviceExtension->ConfigurationDescriptor, &InterfaceDescriptor, &InEndpointDescriptor, &OutEndpointDescriptor); + Status = USBCCGP_ScanConfigurationDescriptor(DeviceExtension, DeviceExtension->ConfigurationDescriptor); if (!NT_SUCCESS(Status)) { // @@ -366,181 +318,69 @@ } // - // now allocate one interface entry and terminating null entry - // - InterfaceList = (PUSBD_INTERFACE_LIST_ENTRY)AllocateItem(PagedPool, sizeof(USBD_INTERFACE_LIST_ENTRY) * 2); - if (!InterfaceList) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } - - // - // initialize interface list entry - // - InterfaceList[0].InterfaceDescriptor = InterfaceDescriptor; - - // // now allocate the urb // - Urb = USBD_CreateConfigurationRequestEx(DeviceExtension->ConfigurationDescriptor, InterfaceList); + Urb = USBD_CreateConfigurationRequestEx(DeviceExtension->ConfigurationDescriptor, DeviceExtension->InterfaceList); if (!Urb) { // // no memory // - FreeItem(InterfaceList); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // - // sanity check - // - ASSERT(InterfaceList[0].Interface); + return STATUS_INSUFFICIENT_RESOURCES; + } // // submit urb // - Status = USBSTOR_SyncUrbRequest(DeviceExtension->LowerDeviceObject, Urb); + Status = USBCCGP_SyncUrbRequest(DeviceExtension->NextDeviceObject, Urb); if (!NT_SUCCESS(Status)) { // // failed to set configuration // - DPRINT1("USBSTOR_SelectConfiguration failed to set interface %x\n", Status); - FreeItem(InterfaceList); + DPRINT1("USBCCGP_SyncUrbRequest failed to set interface %x\n", Status); ExFreePool(Urb); return Status; } // - // backup interface information - // - DeviceExtension->InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)AllocateItem(NonPagedPool, Urb->UrbSelectConfiguration.Interface.Length); - if (!NT_SUCCESS(Status)) - { - // - // failed to allocate interface information structure - // - FreeItem(InterfaceList); - ExFreePool(Urb); - return Status; - } - - // - // copy interface information - // - RtlCopyMemory(DeviceExtension->InterfaceInformation, &Urb->UrbSelectConfiguration.Interface, Urb->UrbSelectConfiguration.Interface.Length); - - // - // store pipe handle - // - DeviceExtension->ConfigurationHandle = Urb->UrbSelectConfiguration.ConfigurationHandle; - - // - // now prepare interface urb - // - UsbBuildSelectInterfaceRequest(Urb, GET_SELECT_INTERFACE_REQUEST_SIZE(InterfaceDescriptor->bNumEndpoints), DeviceExtension->ConfigurationHandle, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting); - - // - // copy interface information structure back - as offset for SelectConfiguration / SelectInterface request do differ - // - RtlCopyMemory(&Urb->UrbSelectInterface.Interface, DeviceExtension->InterfaceInformation, DeviceExtension->InterfaceInformation->Length); - - // - // now select the interface - // - Status = USBSTOR_SyncUrbRequest(DeviceExtension->LowerDeviceObject, Urb); - - // - // did it succeeed - // - if (NT_SUCCESS(Status)) - { - // - // update configuration info - // - ASSERT(Urb->UrbSelectInterface.Interface.Length == DeviceExtension->InterfaceInformation->Length); - RtlCopyMemory(DeviceExtension->InterfaceInformation, &Urb->UrbSelectInterface.Interface, Urb->UrbSelectInterface.Interface.Length); - } - - // - // free interface list & urb - // - FreeItem(InterfaceList); - ExFreePool(Urb); - - // - // done - // - return Status; -} - -NTSTATUS -USBSTOR_GetPipeHandles( - IN PFDO_DEVICE_EXTENSION DeviceExtension) -{ - ULONG Index; - BOOLEAN BulkInFound = FALSE, BulkOutFound = FALSE; - - // - // no enumerate all pipes and extract bulk-in / bulk-out pipe handle - // - for(Index = 0; Index < DeviceExtension->InterfaceInformation->NumberOfPipes; Index++) - { - // - // check pipe type - // - if (DeviceExtension->InterfaceInformation->Pipes[Index].PipeType == UsbdPipeTypeBulk) + // get interface information + // + InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; + + for(Index = 0; Index < DeviceExtension->InterfaceListCount; Index++) + { + // + // allocate buffer to store interface information + // + DeviceExtension->InterfaceList[Index].Interface = AllocateItem(NonPagedPool, InterfaceInformation[Index].Length); + if (!DeviceExtension->InterfaceList[Index].Interface) { // - // check direction + // no memory // - if (USB_ENDPOINT_DIRECTION_IN(DeviceExtension->InterfaceInformation->Pipes[Index].EndpointAddress)) - { - // - // bulk in pipe - // - DeviceExtension->BulkInPipeIndex = Index; - - // - // there should not be another bulk in pipe - // - ASSERT(BulkInFound == FALSE); - BulkInFound = TRUE; - } - else - { - // - // bulk out pipe - // - DeviceExtension->BulkOutPipeIndex = Index; - - // - // there should not be another bulk out pipe - // - ASSERT(BulkOutFound == FALSE); - BulkOutFound = TRUE; - } + return STATUS_INSUFFICIENT_RESOURCES; } - } - - // - // check if both bulk pipes have been found - // - if (!BulkInFound || !BulkOutFound) - { - // - // WTF? usb port driver does not give us bulk pipe access - // - DPRINT1("USBSTOR_GetPipeHandles> BulkInFound %d BulkOutFound %d missing!!!\n", BulkInFound, BulkOutFound); - return STATUS_DEVICE_CONFIGURATION_ERROR; - } - - // - // device is configured - // - return STATUS_SUCCESS; -} + + // + // copy interface information + // + RtlCopyMemory(DeviceExtension->InterfaceList[Index].Interface, InterfaceInformation, InterfaceInformation->Length); + } + + // + // store pipe handle + // + DeviceExtension->ConfigurationHandle = Urb->UrbSelectConfiguration.ConfigurationHandle; + + // + // free interface list & urb + // + ExFreePool(Urb); + + // + // done + // + return Status; +} + Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,0 +1,289 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbccgp/fdo.c + * PURPOSE: USB device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Cameron Gutman + */ + +#include "usbccgp.h" + +NTSTATUS +NTAPI +FDO_QueryCapabilitiesCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + // + // set event + // + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + // + // completion is done in the HidClassFDO_QueryCapabilities routine + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +FDO_QueryCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PDEVICE_CAPABILITIES Capabilities) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // now allocte the irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // init stack location + // + IoStack->MajorFunction = IRP_MJ_PNP; + IoStack->MinorFunction = IRP_MN_QUERY_CAPABILITIES; + IoStack->Parameters.DeviceCapabilities.Capabilities = Capabilities; + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, FDO_QueryCapabilitiesCompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); + + // + // init capabilities + // + RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); + Capabilities->Size = sizeof(DEVICE_CAPABILITIES); + Capabilities->Version = 1; // FIXME hardcoded constant + Capabilities->Address = MAXULONG; + Capabilities->UINumber = MAXULONG; + + // + // pnp irps have default completion code + // + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + // + // call lower device + // + Status = IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + // + // get status + // + Status = Irp->IoStatus.Status; + + // + // complete request + // + IoFreeIrp(Irp); + + // + // done + // + return Status; +} + +NTSTATUS +FDO_DeviceRelations( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +FDO_StartDevice( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + NTSTATUS Status; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // first start lower device + // + Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + + if (!NT_SUCCESS(Status)) + { + // + // failed to start lower device + // + DPRINT1("FDO_StartDevice lower device failed to start with %x\n", Status); + return Status; + } + + // get descriptors + Status = USBCCGP_GetDescriptors(DeviceObject); + if (!NT_SUCCESS(Status)) + { + // failed to start lower device + DPRINT1("FDO_StartDevice failed to get descriptors with %x\n", Status); + return Status; + } + + // get capabilities + Status = FDO_QueryCapabilities(DeviceObject, &FDODeviceExtension->Capabilities); + if (!NT_SUCCESS(Status)) + { + // failed to start lower device + DPRINT1("FDO_StartDevice failed to get capabilities with %x\n", Status); + return Status; + } + + // now select the configuration + Status = USBCCGP_SelectConfiguration(DeviceObject, FDODeviceExtension); + if (!NT_SUCCESS(Status)) + { + // failed to select interface + DPRINT1("FDO_StartDevice failed to get capabilities with %x\n", Status); + return Status; + } + + // + // FIXME: parse usb interface association descriptor + // and create PDO for each function + // + ASSERT(FALSE); + return Status; +} + + +NTSTATUS +FDO_HandlePnp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // get device extension + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + + // get stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + Status = FDO_StartDevice(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + Status = FDO_DeviceRelations(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + // + // copy capabilities + // + RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + // + // surprise removal ok + // + IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE; + } + break; + } + default: + { + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); + } + + } + + // + // complete request + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + +} + +NTSTATUS +FDO_Dispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->MajorFunction) + { + case IRP_MJ_PNP: + return FDO_HandlePnp(DeviceObject, Irp); + default: + DPRINT1("FDO_Dispatch Function %x not implemented\n", IoStack->MajorFunction); + ASSERT(FALSE); + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } +} + + Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbccgp/fdo.c + * PURPOSE: USB device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Cameron Gutman + */ + +#include "usbccgp.h" + + + +NTSTATUS +PDO_Dispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,0 +1,150 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbccgp/fdo.c + * PURPOSE: USB device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Cameron Gutman + */ + +#include "usbccgp.h" + +// +// driver verifier +// +DRIVER_ADD_DEVICE USBCCGP_AddDevice; + +NTSTATUS +NTAPI +USBCCGP_AddDevice( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT DeviceObject; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // lets create the device + Status = IoCreateDevice(DriverObject, sizeof(FDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_USB, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + // failed to create device + DPRINT1("USBCCGP_AddDevice failed to create device with %x\n", Status); + return Status; + } + + // get device extension + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // init device extension + RtlZeroMemory(FDODeviceExtension, sizeof(FDO_DEVICE_EXTENSION)); + FDODeviceExtension->Common.IsFDO = TRUE; + FDODeviceExtension->DriverObject = DriverObject; + FDODeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + FDODeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + if (!FDODeviceExtension->NextDeviceObject) + { + // failed to attach + DPRINT1("USBCCGP_AddDevice failed to attach device\n"); + IoDeleteDevice(DeviceObject); + return STATUS_DEVICE_REMOVED; + } + + // set device flags + DeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + + // device is initialized + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + // device initialized + return Status; +} + +NTSTATUS +NTAPI +USBCCGP_CreateClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCOMMON_DEVICE_EXTENSION DeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // get common device extension + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // is it a fdo + if (DeviceExtension->IsFDO) + { + // forward and forget + IoSkipCurrentIrpStackLocation(Irp); + + // get fdo + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // call lower driver + return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); + } + else + { + // pdo not supported + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } +} + +NTSTATUS +NTAPI +USBCCGP_Dispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCOMMON_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + + // get common device extension + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // get current stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->MajorFunction == IRP_MJ_CREATE || IoStack->MajorFunction == IRP_MJ_CLOSE) + { + // dispatch to default handler + return USBCCGP_CreateClose(DeviceObject, Irp); + } + + if (DeviceExtension->IsFDO) + { + // handle request for FDO + return FDO_Dispatch(DeviceObject, Irp); + } + else + { + // handle request for PDO + return PDO_Dispatch(DeviceObject, Irp); + } +} + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + + // initialize driver object + DriverObject->DriverExtension->AddDevice = USBCCGP_AddDevice; + DriverObject->MajorFunction[IRP_MJ_CREATE] = USBCCGP_Dispatch; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBCCGP_Dispatch; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBCCGP_Dispatch; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBCCGP_Dispatch; + DriverObject->MajorFunction[IRP_MJ_POWER] = USBCCGP_Dispatch; + DriverObject->MajorFunction[IRP_MJ_PNP] = USBCCGP_Dispatch; + + // FIMXE query GenericCompositeUSBDeviceString + + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,0 +1,96 @@ +#ifndef USBEHCI_H__ +#define USBEHCI_H__ + +#include <ntddk.h> +#define YDEBUG +#include <debug.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usbdlib.h> + +// +// FIXME: +// #include <usbprotocoldefs.h> +// +#include <usb.h> +#include <stdio.h> +#include <wdmguid.h> + +typedef struct +{ + BOOLEAN IsFDO; // is device a FDO or PDO +}COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct +{ + COMMON_DEVICE_EXTENSION Common; // shared with PDO + PDRIVER_OBJECT DriverObject; // driver object + PDEVICE_OBJECT PhysicalDeviceObject; // physical device object + PDEVICE_OBJECT NextDeviceObject; // lower device object + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; // usb device descriptor + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; // usb configuration descriptor + DEVICE_CAPABILITIES Capabilities; // device capabilities + PUSBD_INTERFACE_LIST_ENTRY InterfaceList; // interface list + ULONG InterfaceListCount; // interface list count + USBD_CONFIGURATION_HANDLE ConfigurationHandle; // configuration handle +}FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; + +#define USBCCPG_TAG 'cbsu' + +typedef struct +{ + COMMON_DEVICE_EXTENSION Common; // shared with FDO + +}PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; + +/* descriptor.c */ + +NTSTATUS +USBCCGP_GetDescriptors( + IN PDEVICE_OBJECT DeviceObject); + +NTSTATUS +USBCCGP_SelectConfiguration( + IN PDEVICE_OBJECT DeviceObject, + IN PFDO_DEVICE_EXTENSION DeviceExtension); + +/* misc.c */ + +NTSTATUS +NTAPI +USBCCGP_SyncForwardIrp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +NTSTATUS +USBCCGP_SyncUrbRequest( + IN PDEVICE_OBJECT DeviceObject, + OUT PURB UrbRequest); + +PVOID +AllocateItem( + IN POOL_TYPE PoolType, + IN ULONG ItemSize); + +VOID +FreeItem( + IN PVOID Item); + +/* fdo.c */ + +NTSTATUS +FDO_Dispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +/* pdo.c */ + +NTSTATUS +PDO_Dispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + + + +#endif Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rc (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rc [iso-8859-1] Thu Jan 26 03:42:56 2012 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USBCCGP Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usccpg\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbccpg.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 55194: [HIDCLASS] - Implement IRP_MN_REMOVE_DEVICE for FDOs and PDOs - USB mice will now work after being disconnected then reconnected
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 03:27:22 2012 New Revision: 55194 URL: http://svn.reactos.org/svn/reactos?rev=55194&view=rev Log: [HIDCLASS] - Implement IRP_MN_REMOVE_DEVICE for FDOs and PDOs - USB mice will now work after being disconnected then reconnected Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c [iso-8859-1] Thu Jan 26 03:27:22 2012 @@ -384,9 +384,18 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension = DeviceObject->DeviceExtension; + NTSTATUS Status; + + /* Pass the IRP down */ + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + + /* Now teardown our portion of the device stack */ + IoDetachDevice(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); + IoDeleteDevice(DeviceObject); + + return Status; } NTSTATUS Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Jan 26 03:27:22 2012 @@ -514,14 +514,18 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("[HIDCLASS] PDO IRP_MN_REMOVE_DEVICE not implemented\n"); - ASSERT(FALSE); - - // - // do nothing - // - Status = STATUS_SUCCESS; //Irp->IoStatus.Status; - break; + /* Disable the device interface */ + if (PDODeviceExtension->DeviceInterface.Length != 0) + IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, FALSE); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Delete our device object*/ + IoDeleteDevice(DeviceObject); + + return STATUS_SUCCESS; } case IRP_MN_QUERY_INTERFACE: {

1 0

[cgutman] 55193: [NTOSKRNL] - Add a hack so that registering an interface after a remove and reconnect works
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 03:24:47 2012 New Revision: 55193 URL: http://svn.reactos.org/svn/reactos?rev=55193&view=rev Log: [NTOSKRNL] - Add a hack so that registering an interface after a remove and reconnect works Modified: branches/usb-bringup-trunk/ntoskrnl/io/iomgr/deviface.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/i… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Thu Jan 26 03:24:47 2012 @@ -1145,7 +1145,12 @@ /* If the symbolic link already exists, return an informational success status */ if (SymLinkStatus == STATUS_OBJECT_NAME_COLLISION) + { + /* HACK: Delete the existing symbolic link and update it to the new PDO name */ + IoDeleteSymbolicLink(SymbolicLinkName); + IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); SymLinkStatus = STATUS_OBJECT_NAME_EXISTS; + } if (!NT_SUCCESS(SymLinkStatus)) {

1 0

[cgutman] 55192: [MOUCLASS] - Pass down unsupported IRPs instead of completing them
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 02:59:58 2012 New Revision: 55192 URL: http://svn.reactos.org/svn/reactos?rev=55192&view=rev Log: [MOUCLASS] - Pass down unsupported IRPs instead of completing them Modified: branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c Modified: branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/mouclass/mouclass.c [iso-8859-1] Thu Jan 26 02:59:58 2012 @@ -854,7 +854,7 @@ } Irp->IoStatus.Status = Status; - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) || Status == STATUS_NOT_SUPPORTED) { IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDevice, Irp);

1 0

[cgutman] 55191: [MOUHID] - Multiple the scroll value by WHEEL_DELTA (120) like i8042prt does - Scrolling with USB mice works now - Disable debugging
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 02:50:15 2012 New Revision: 55191 URL: http://svn.reactos.org/svn/reactos?rev=55191&view=rev Log: [MOUHID] - Multiple the scroll value by WHEEL_DELTA (120) like i8042prt does - Scrolling with USB mice works now - Disable debugging Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] Thu Jan 26 02:50:15 2012 @@ -219,15 +219,15 @@ { /* store wheel status */ MouseInputData.ButtonFlags |= MOUSE_WHEEL; - MouseInputData.ButtonData = (USHORT)UsageValue; /* FIXME */ + MouseInputData.ButtonData = (USHORT)(UsageValue * WHEEL_DELTA); } else { - DPRINT1("[MOUHID] failed to get wheel status with %x\n", Status); + DPRINT("[MOUHID] failed to get wheel status with %x\n", Status); } } - DPRINT1("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + DPRINT("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); /* dispatch mouse action */ MouHid_DispatchInputData(DeviceExtension, &MouseInputData); Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] Thu Jan 26 02:50:15 2012 @@ -110,6 +110,7 @@ }MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; +#define WHEEL_DELTA 120 NTSTATUS MouHid_InitiateRead(

1 0

[cgutman] 55190: [MOUHID] - Only set the MOUSE_WHEEL flag if the wheel data is non-zero
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 02:20:11 2012 New Revision: 55190 URL: http://svn.reactos.org/svn/reactos?rev=55190&view=rev Log: [MOUHID] - Only set the MOUSE_WHEEL flag if the wheel data is non-zero Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] Thu Jan 26 02:20:11 2012 @@ -215,7 +215,7 @@ /* get usage */ UsageValue = 0; Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_WHEEL, &UsageValue, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); - if (Status == HIDP_STATUS_SUCCESS) + if (Status == HIDP_STATUS_SUCCESS && UsageValue != 0) { /* store wheel status */ MouseInputData.ButtonFlags |= MOUSE_WHEEL;

1 0

[cgutman] 55189: [USBOHCI] - Properly dismiss the enable status changed interrupt to avoid an interrupt storm after a device is disconnected
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 01:46:06 2012 New Revision: 55189 URL: http://svn.reactos.org/svn/reactos?rev=55189&view=rev Log: [USBOHCI] - Properly dismiss the enable status changed interrupt to avoid an interrupt storm after a device is disconnected Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Thu Jan 26 01:46:06 2012 @@ -1125,9 +1125,9 @@ if (Value & OHCI_RH_PORTSTATUS_PES) *PortStatus |= USB_PORT_STATUS_ENABLE; - // port enabled + // port disconnect or hardware error if (Value & OHCI_RH_PORTSTATUS_PESC) - *PortChange |= USB_PORT_STATUS_ENABLE; + *PortChange |= USB_PORT_STATUS_CONNECT; // port suspend if (Value & OHCI_RH_PORTSTATUS_PSS) @@ -1211,7 +1211,6 @@ // // sanity checks // - ASSERT((Value & OHCI_RH_PORTSTATUS_PRS) == 0); ASSERT((Value & OHCI_RH_PORTSTATUS_PRSC)); // @@ -1219,27 +1218,24 @@ // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRSC); - // // sanity check // ASSERT((Value & OHCI_RH_PORTSTATUS_PES)); - - // - // re-enable root hub change - // - Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)); - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), Value | OHCI_ROOT_HUB_STATUS_CHANGE); - - } - - if (Status == C_PORT_CONNECTION) - { - // - // clear bit - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC); - } + } + + if (Status == C_PORT_CONNECTION || Status == C_PORT_ENABLE) + { + // + // clear bits + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC | OHCI_RH_PORTSTATUS_PESC); + } + + // + // re-enable root hub change + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); return STATUS_SUCCESS; } @@ -1475,10 +1471,6 @@ if (Status & OHCI_ROOT_HUB_STATUS_CHANGE) { // - // new device has arrived - // - - // // disable interrupt as it will fire untill the port has been reset // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_DISABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE);

1 0

[cgutman] 55188: [USBEHCI] - Fix GetPortStatus() and remove the cached status stuff (except for reset that we have to cache because the EHCI spec has no port reset complete bit)
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 00:29:25 2012 New Revision: 55188 URL: http://svn.reactos.org/svn/reactos?rev=55188&view=rev Log: [USBEHCI] - Fix GetPortStatus() and remove the cached status stuff (except for reset that we have to cache because the EHCI spec has no port reset complete bit) Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Jan 26 00:29:25 2012 @@ -114,9 +114,9 @@ HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress - EHCI_PORT_STATUS m_PortStatus[16]; // port status WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback ULONG m_SyncFramePhysAddr; // periodic frame list physical address + BOOLEAN m_ResetInProgress[16]; // set when a reset is in progress // set command VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); @@ -713,7 +713,6 @@ OUT USHORT *PortStatus, OUT USHORT *PortChange) { -#if 0 ULONG Value; USHORT Status = 0, Change = 0; @@ -763,8 +762,11 @@ Status |= USB_PORT_STATUS_OVER_CURRENT; // In a reset state? - if (Value & EHCI_PRT_RESET) + if ((Value & EHCI_PRT_RESET) || m_ResetInProgress[PortId]) + { Status |= USB_PORT_STATUS_RESET; + Change |= USB_PORT_STATUS_RESET; + } // // FIXME: Is the Change here correct? @@ -777,10 +779,7 @@ *PortStatus = Status; *PortChange = Change; -#else - *PortStatus = m_PortStatus[PortId].PortStatus; - *PortChange = m_PortStatus[PortId].PortChange; -#endif + return STATUS_SUCCESS; } @@ -811,10 +810,8 @@ // // update port status // - m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_RESET; - if (Value & EHCI_PRT_ENABLED) - m_PortStatus[PortId].PortStatus |= USB_PORT_STATUS_ENABLE; - else + m_ResetInProgress[PortId] = FALSE; + if (!(Value & EHCI_PRT_ENABLED)) { DPRINT1("Port is not enabled.\n"); } @@ -822,12 +819,8 @@ if (Status == C_PORT_CONNECTION) { - // FIXME: Make sure its the Connection and Enable Change status. - Value |= EHCI_PRT_CONNECTSTATUSCHANGE; - Value |= EHCI_PRT_ENABLEDSTATUSCHANGE; + Value |= EHCI_PRT_CONNECTSTATUSCHANGE | EHCI_PRT_ENABLEDSTATUSCHANGE; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); - - m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_CONNECT; } return STATUS_SUCCESS; @@ -868,8 +861,7 @@ // // update cached settings // - m_PortStatus[PortId].PortChange |= USB_PORT_STATUS_RESET; - m_PortStatus[PortId].PortStatus &= ~USB_PORT_STATUS_ENABLE; + m_ResetInProgress[PortId] = TRUE; // // is there a status change callback @@ -1100,11 +1092,6 @@ // if (PortStatus & EHCI_PRT_CONNECTSTATUSCHANGE) { - // - // Clear the port change status - // - //This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), PortStatus | EHCI_PRT_CONNECTSTATUSCHANGE); - if (PortStatus & EHCI_PRT_CONNECTED) { DPRINT1("Device connected on port %d\n", i); @@ -1126,26 +1113,12 @@ continue; } } - - // - // update port status flags - // - This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED; - This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_CONNECT; - This->m_PortStatus[i].PortChange |= USB_PORT_STATUS_CONNECT; } else { DPRINT1("Device disconnected on port %d\n", i); - - // - // update port status flags - // - This->m_PortStatus[i].PortStatus &= ~USB_PORT_STATUS_HIGH_SPEED; - This->m_PortStatus[i].PortStatus &= ~USB_PORT_STATUS_CONNECT; - This->m_PortStatus[i].PortChange |= USB_PORT_STATUS_CONNECT; } - + // // is there a status change callback //

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012