Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[cgutman] 55928: [USBEHCI] - Add back the m_PortResetInProgress hack for broken vbox behavior

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Feb 29 19:05:16 2012 New Revision: 55928 URL: http://svn.reactos.org/svn/reactos?rev=55928&view=rev Log: [USBEHCI] - Add back the m_PortResetInProgress hack for broken vbox behavior Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Wed Feb 29 19:05:16 2012 @@ -99,6 +99,7 @@ ULONG m_WorkItemActive; // work item status ULONG m_SyncFramePhysAddr; // periodic frame list physical address BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface + BOOLEAN m_PortResetInProgress[0xF]; // stores reset in progress (vbox hack) // read register ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); @@ -357,8 +358,8 @@ DPRINT1("Controller has %d Length\n", m_Capabilities.Length); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); - DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); - DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); + DPRINT1("Controller EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); + DPRINT1("Controller EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); // @@ -977,7 +978,7 @@ Status |= USB_PORT_STATUS_OVER_CURRENT; // In a reset state? - if (Value & EHCI_PRT_RESET) + if ((Value & EHCI_PRT_RESET) || m_PortResetInProgress[PortId]) { Status |= USB_PORT_STATUS_RESET; Change |= USB_PORT_STATUS_RESET; @@ -1013,6 +1014,9 @@ if (Status == C_PORT_RESET) { + // reset done + m_PortResetInProgress[PortId] = FALSE; + // Clear reset Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); Value &= (EHCI_PORTSC_DATAMASK | EHCI_PRT_ENABLED); @@ -1136,6 +1140,9 @@ // call the helper // ResetPort(PortId); + + // reset in progress + m_PortResetInProgress[PortId] = TRUE; // // is there a status change callback

12 years, 9 months

[janderwald] 55927: [USBHUB] - Check if FDO is root hub fdo - Partly implement fdo hub initialization - Implement IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 29 18:51:07 2012 New Revision: 55927 URL: http://svn.reactos.org/svn/reactos?rev=55927&view=rev Log: [USBHUB] - Check if FDO is root hub fdo - Partly implement fdo hub initialization - Implement IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO Added: trunk/reactos/drivers/usb/usbhub/hub_fdo.c (with props) Modified: trunk/reactos/drivers/usb/usbhub/CMakeLists.txt trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/misc.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/CMakeLi… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbhub SHARED fdo.c misc.c pdo.c usbhub.c usbhub.rc) +add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c usbhub.rc) target_link_libraries(usbhub ${PSEH_LIB}) 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] Wed Feb 29 18:51:07 2012 @@ -27,71 +27,6 @@ IN PDEVICE_OBJECT UsbHubDeviceObject, IN LONG PortId); -NTSTATUS -SubmitRequestToRootHub( - IN PDEVICE_OBJECT RootHubDeviceObject, - IN ULONG IoControlCode, - OUT PVOID OutParameter1, - OUT PVOID OutParameter2) -{ - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - PIO_STACK_LOCATION Stack = NULL; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - // - // Build Control Request - // - Irp = IoBuildDeviceIoControlRequest(IoControlCode, - RootHubDeviceObject, - NULL, 0, - NULL, 0, - TRUE, - &Event, - &IoStatus); - - if (Irp == NULL) - { - DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // - // Initialize the status block before sending the IRP - // - IoStatus.Status = STATUS_NOT_SUPPORTED; - IoStatus.Information = 0; - - // - // Get Next Stack Location and Initialize it - // - Stack = IoGetNextIrpStackLocation(Irp); - Stack->Parameters.Others.Argument1 = OutParameter1; - Stack->Parameters.Others.Argument2 = OutParameter2; - - // - // Call RootHub - // - Status = IoCallDriver(RootHubDeviceObject, Irp); - - // - // Its ok to block here as this function is called in an nonarbitrary thread - // - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - // - // The IO Manager will free the IRP - // - - return Status; -} NTSTATUS GetPortStatusAndChange( @@ -1506,6 +1441,31 @@ } } } + +BOOLEAN +USBHUB_IsRootHubFDO( + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT RootHubPhysicalDeviceObject = NULL; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + + // get hub device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + // Get the Root Hub Pdo + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, + &RootHubPhysicalDeviceObject, + NULL); + + // FIXME handle error + ASSERT(NT_SUCCESS(Status)); + + // physical device object is only obtained for root hubs + return (RootHubPhysicalDeviceObject != NULL); +} + NTSTATUS USBHUB_FdoStartDevice( @@ -1969,7 +1929,15 @@ { case IRP_MN_START_DEVICE: { - Status = USBHUB_FdoStartDevice(DeviceObject, Irp); + if (USBHUB_IsRootHubFDO(DeviceObject)) + { + // start root hub fdo + Status = USBHUB_FdoStartDevice(DeviceObject, Irp); + } + else + { + Status = USBHUB_ParentFDOStartDevice(DeviceObject, Irp); + } break; } Added: trunk/reactos/drivers/usb/usbhub/hub_fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/hub_fdo… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/hub_fdo.c (added) +++ trunk/reactos/drivers/usb/usbhub/hub_fdo.c [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -1,0 +1,212 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Hub Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbhub/hub_fdo.c + * PURPOSE: Hub FDO + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ +#include "usbhub.h" + +NTSTATUS +USBHUB_ParentFDOStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PURB Urb, ConfigurationUrb; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSBD_INTERFACE_LIST_ENTRY InterfaceList; + ULONG Index; + NTSTATUS Status; + + // get hub device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + // Send the StartDevice to lower device object + Status = ForwardIrpAndWait(HubDeviceExtension->LowerDeviceObject, Irp); + + if (!NT_SUCCESS(Status)) + { + // failed to start pdo + DPRINT1("Failed to start the RootHub PDO\n"); + return Status; + } + + // FIXME get capabilities + + Urb = ExAllocatePool(NonPagedPool, sizeof(URB)); + if (!Urb) + { + // no memory + DPRINT1("No memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + + // lets get device descriptor + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_DEVICE_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubDeviceDescriptor, + NULL, + sizeof(USB_DEVICE_DESCRIPTOR), + NULL); + + + // get hub device descriptor + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + // failed to get device descriptor of hub + DPRINT1("Failed to get hub device descriptor with Status %x!\n", Status); + ExFreePool(Urb); + return Status; + } + + // now get configuration descriptor + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_CONFIGURATION_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubConfigDescriptor, + NULL, + sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), + NULL); + + // request configuration descriptor + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + // failed to get configuration descriptor + DPRINT1("Failed to get hub configuration descriptor with status %x\n", Status); + ExFreePool(Urb); + return Status; + } + + // sanity checks + ASSERT(HubDeviceExtension->HubConfigDescriptor.wTotalLength == sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bNumInterfaces == 1); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bNumEndpoints == 1); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bmAttributes == USB_ENDPOINT_TYPE_INTERRUPT); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bEndpointAddress == 0x81); // interrupt in + + // Build hub descriptor request + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_DEVICE, + sizeof(Urb->UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + 0, + USB_REQUEST_GET_DESCRIPTOR, + USB_DEVICE_CLASS_RESERVED, + 0, + &HubDeviceExtension->HubDescriptor, + NULL, + sizeof(USB_HUB_DESCRIPTOR), + NULL); + + // send request + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Descriptor Status %x!\n", Status); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + // sanity checks + ASSERT(HubDeviceExtension->HubDescriptor.bDescriptorLength == sizeof(USB_HUB_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubDescriptor.bNumberOfPorts); + ASSERT(HubDeviceExtension->HubDescriptor.bDescriptorType == 0x29); + + // store number of ports + DPRINT1("NumberOfPorts %lu\n", HubDeviceExtension->HubDescriptor.bNumberOfPorts); + HubDeviceExtension->UsbExtHubInfo.NumberOfPorts = HubDeviceExtension->HubDescriptor.bNumberOfPorts; + + // allocate interface list + InterfaceList = ExAllocatePool(NonPagedPool, sizeof(USBD_INTERFACE_LIST_ENTRY) * (HubDeviceExtension->HubConfigDescriptor.bNumInterfaces + 1)); + if (!InterfaceList) + { + // no memory + DPRINT1("No memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // zero list + RtlZeroMemory(InterfaceList, sizeof(USBD_INTERFACE_LIST_ENTRY) * (HubDeviceExtension->HubConfigDescriptor.bNumInterfaces + 1)); + + // grab all interface descriptors + for(Index = 0; Index < HubDeviceExtension->HubConfigDescriptor.bNumInterfaces; Index++) + { + // Get the first Configuration Descriptor + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(&HubDeviceExtension->HubConfigDescriptor, + &HubDeviceExtension->HubConfigDescriptor, + Index, 0, -1, -1, -1); + + // store in list + InterfaceList[Index].InterfaceDescriptor = InterfaceDescriptor; + } + + // now create configuration request + ConfigurationUrb = USBD_CreateConfigurationRequestEx(&HubDeviceExtension->HubConfigDescriptor, + (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); + if (ConfigurationUrb == NULL) + { + // failed to build urb + DPRINT1("Failed to build configuration urb\n"); + ExFreePool(Urb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // send request + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + ConfigurationUrb, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Descriptor Status %x!\n", Status); + ExFreePool(Urb); + ExFreePool(ConfigurationUrb); + return STATUS_UNSUCCESSFUL; + } + + // store configuration & pipe handle + HubDeviceExtension->ConfigurationHandle = ConfigurationUrb->UrbSelectConfiguration.ConfigurationHandle; + HubDeviceExtension->PipeHandle = ConfigurationUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; + DPRINT("Hub Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + + // free urb + ExFreePool(ConfigurationUrb); + ExFreePool(Urb); + + // FIXME build SCE interrupt request + + // FIXME create pdos + + return Status; +} + Propchange: trunk/reactos/drivers/usb/usbhub/hub_fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbhub/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/misc.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -143,3 +143,68 @@ return IoCallDriver(LowerDevice, Irp); } +NTSTATUS +SubmitRequestToRootHub( + IN PDEVICE_OBJECT RootHubDeviceObject, + IN ULONG IoControlCode, + OUT PVOID OutParameter1, + OUT PVOID OutParameter2) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // Build Control Request + // + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + RootHubDeviceObject, + NULL, 0, + NULL, 0, + TRUE, + &Event, + &IoStatus); + + if (Irp == NULL) + { + DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Initialize the status block before sending the IRP + // + IoStatus.Status = STATUS_NOT_SUPPORTED; + IoStatus.Information = 0; + + // + // Get Next Stack Location and Initialize it + // + Stack = IoGetNextIrpStackLocation(Irp); + Stack->Parameters.Others.Argument1 = OutParameter1; + Stack->Parameters.Others.Argument2 = OutParameter2; + + // + // Call RootHub + // + Status = IoCallDriver(RootHubDeviceObject, Irp); + + // + // Its ok to block here as this function is called in an nonarbitrary thread + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + // + // The IO Manager will free the IRP + // + + return Status; +} 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] Wed Feb 29 18:51:07 2012 @@ -339,8 +339,39 @@ DPRINT1("IOCTL_INTERNAL_USB_CYCLE_PORT\n"); break; case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: + { DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n"); - break; + if (Stack->Parameters.Others.Argument1) + { + // store device handle + *(PVOID *)Stack->Parameters.Others.Argument1 = (PVOID)ChildDeviceExtension->UsbDeviceHandle; + Status = STATUS_SUCCESS; + } + else + { + // invalid parameter + Status = STATUS_INVALID_PARAMETER; + } + break; + } + case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: + { + if (Stack->Parameters.Others.Argument1) + { + // inform caller that it is a real usb hub + *(PVOID *)Stack->Parameters.Others.Argument1 = NULL; + } + + if (Stack->Parameters.Others.Argument2) + { + // output device object + *(PVOID *)Stack->Parameters.Others.Argument2 = DeviceObject; + } + + // done + Status = STATUS_SUCCESS; + break; + } default: { DPRINT1("Unknown IOCTL code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -142,6 +142,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +SubmitRequestToRootHub( + IN PDEVICE_OBJECT RootHubDeviceObject, + IN ULONG IoControlCode, + OUT PVOID OutParameter1, + OUT PVOID OutParameter2); + // pdo.c NTSTATUS USBHUB_PdoHandlePnp( @@ -170,3 +177,10 @@ IN PDEVICE_OBJECT RootHubDeviceObject, IN ULONG PortId, OUT PPORT_STATUS_CHANGE StatusChange); + +// hub_fdo.c + +NTSTATUS +USBHUB_ParentFDOStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp);

12 years, 9 months

[cgutman] 55926: [NTOSKRNL] - Add a missing device node flag to legacy reported devices to avoid an assertion failure during installation - The fact that this was exposed by a change in device node...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Feb 29 18:50:07 2012 New Revision: 55926 URL: http://svn.reactos.org/svn/reactos?rev=55926&view=rev Log: [NTOSKRNL] - Add a missing device node flag to legacy reported devices to avoid an assertion failure during installation - The fact that this was exposed by a change in device node linking order terrifies me Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Wed Feb 29 18:50:07 2012 @@ -229,6 +229,9 @@ return Status; } + /* We're enumerated already */ + IopDeviceNodeSetFlag(DeviceNode, DNF_ENUMERATED); + /* We don't call AddDevice for devices reported this way */ IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED);

12 years, 9 months

[jgardou] 55925: [NTOSKRNL/MM] - assert PDE ref count consistency everywhere - fix the fix(tm) : after reference decrement, the maximum must not be reached

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Feb 29 17:41:45 2012 New Revision: 55925 URL: http://svn.reactos.org/svn/reactos?rev=55925&view=rev Log: [NTOSKRNL/MM] - assert PDE ref count consistency everywhere - fix the fix(tm) : after reference decrement, the maximum must not be reached Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Feb 29 17:41:45 2012 @@ -412,7 +412,7 @@ { DPRINT("Decrement used PTEs by address: %lx\n", Va); (*UsedPageTableEntries)--; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + ASSERT((*UsedPageTableEntries) < PTE_COUNT); DPRINT("Refs: %lx\n", (*UsedPageTableEntries)); /* Check if the PTE is actually mapped in */ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Wed Feb 29 17:41:45 2012 @@ -117,6 +117,7 @@ else if(Address < MmSystemRangeStart) { AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif MmUnlockAddressSpace(AddressSpace); @@ -416,6 +417,7 @@ if(Address < MmSystemRangeStart) { AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif } @@ -440,6 +442,7 @@ if(Address < MmSystemRangeStart) { AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Wed Feb 29 17:41:45 2012 @@ -758,7 +758,7 @@ { ASSERT(AddressSpace != MmGetKernelAddressSpace()); MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); if(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) { /* No PTE relies on this PDE. Release it */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Feb 29 17:41:45 2012 @@ -1602,6 +1602,7 @@ if(Address < MmSystemRangeStart) { MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif MmLockAddressSpace(AddressSpace); @@ -1978,7 +1979,7 @@ if((Address < MmSystemRangeStart) && (Process != PageOutContext->CallingProcess)) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif @@ -2158,7 +2159,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif MmSetSavedSwapEntryPage(Page, 0); @@ -2186,7 +2187,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif MmSetSavedSwapEntryPage(Page, 0); @@ -2247,7 +2248,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif MmReleasePageMemoryConsumer(MC_USER, Page); @@ -2413,7 +2414,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif Entry = MAKE_SWAP_SSE(SwapEntry);

12 years, 10 months

[fireball] 55924: - Fix one more assert in addition to 55921.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 29 17:13:05 2012 New Revision: 55924 URL: http://svn.reactos.org/svn/reactos?rev=55924&view=rev Log: - Fix one more assert in addition to 55921. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Wed Feb 29 17:13:05 2012 @@ -758,7 +758,7 @@ { ASSERT(AddressSpace != MmGetKernelAddressSpace()); MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); if(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) { /* No PTE relies on this PDE. Release it */

12 years, 10 months

[janderwald] 55923: [USBHUB] - Clean up code, fix memory leaks, check returns codes, add asserts - Use root device handle which is is prerequisite for usb hub support [USBLIB] - Fix root hub handle...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 29 17:08:32 2012 New Revision: 55923 URL: http://svn.reactos.org/svn/reactos?rev=55923&view=rev Log: [USBHUB] - Clean up code, fix memory leaks, check returns codes, add asserts - Use root device handle which is is prerequisite for usb hub support [USBLIB] - Fix root hub handle checks - Add more code for hub support Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/lib/drivers/libusb/hub_controller.cpp 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] Wed Feb 29 17:08:32 2012 @@ -133,6 +133,10 @@ sizeof(PORT_STATUS_CHANGE), 0); + // FIXME: support usb hubs + Urb->UrbHeader.UsbdDeviceHandle = NULL; + + // // Query the Root Hub // @@ -185,6 +189,10 @@ 0, 0, 0); + + // FIXME support usbhubs + Urb->UrbHeader.UsbdDeviceHandle = NULL; + // // Query the Root Hub // @@ -237,6 +245,10 @@ 0, 0, 0); + + // FIXME: support usb hubs + Urb->UrbHeader.UsbdDeviceHandle = NULL; + // // Query the Root Hub // @@ -515,15 +527,12 @@ USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, NULL); - // - // Set the device handle to null for roothub - // - PendingSCEUrb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + // Set the device handle + PendingSCEUrb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; // // Allocate an Irp // - HubDeviceExtension->PendingSCEIrp = ExAllocatePoolWithTag(NonPagedPool, IoSizeOfIrp(RootHubDeviceObject->StackSize), USB_HUB_TAG); @@ -798,12 +807,8 @@ ExFreePool(StringDesc); return STATUS_INSUFFICIENT_RESOURCES; } - DPRINT("Buffer %p\n", Buffer); + RtlZeroMemory(Buffer, SizeNeeded); - - DPRINT("SizeNeeded %lu\n", SizeNeeded); - DPRINT("Offset %lu\n", FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); - DPRINT("Length %lu\n", SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); // // Copy the string to destination @@ -1503,6 +1508,450 @@ } NTSTATUS +USBHUB_FdoStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PURB Urb; + PUSB_INTERFACE_DESCRIPTOR Pid; + ULONG Result = 0, PortId; + USBD_INTERFACE_LIST_ENTRY InterfaceList[2] = {{NULL, NULL}, {NULL, NULL}}; + PURB ConfigUrb = NULL; + ULONG HubStatus; + PIO_STACK_LOCATION Stack; + NTSTATUS Status = STATUS_SUCCESS; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PDEVICE_OBJECT RootHubDeviceObject; + PVOID HubInterfaceBusContext , UsbDInterfaceBusContext; + PORT_STATUS_CHANGE StatusChange; + + // get current stack location + Stack = IoGetCurrentIrpStackLocation(Irp); + + // get hub device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + + // Allocated size including the sizeof USBD_INTERFACE_LIST_ENTRY + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY), USB_HUB_TAG); + if (!Urb) + { + // no memory + return STATUS_INSUFFICIENT_RESOURCES; + } + + // zero urb + RtlZeroMemory(Urb, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY)); + + // Get the Root Hub Pdo + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, + &HubDeviceExtension->RootHubPhysicalDeviceObject, + &HubDeviceExtension->RootHubFunctionalDeviceObject); + if (!NT_SUCCESS(Status)) + { + // failed to obtain hub pdo + DPRINT1("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO failed with %x\n", Status); + ExFreePool(Urb); + return Status; + } + + // sanity checks + ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject); + ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject); + + // get roothub + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; + + // Send the StartDevice to RootHub + Status = ForwardIrpAndWait(RootHubDeviceObject, Irp); + + if (!NT_SUCCESS(Status)) + { + // failed to start pdo + DPRINT1("Failed to start the RootHub PDO\n"); + ExFreePool(Urb); + return Status; + } + + // Get the current number of hubs + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_GET_HUB_COUNT, + &HubDeviceExtension->NumberOfHubs, NULL); + if (!NT_SUCCESS(Status)) + { + // failed to get number of hubs + DPRINT1("IOCTL_INTERNAL_USB_GET_HUB_COUNT failed with %x\n", Status); + ExFreePool(Urb); + return Status; + } + + // Get the Hub Interface + Status = QueryInterface(RootHubDeviceObject, + USB_BUS_INTERFACE_HUB_GUID, + sizeof(USB_BUS_INTERFACE_HUB_V5), + USB_BUSIF_HUB_VERSION_5, + (PVOID)&HubDeviceExtension->HubInterface); + + if (!NT_SUCCESS(Status)) + { + // failed to get root hub interface + DPRINT1("Failed to get HUB_GUID interface with status 0x%08lx\n", Status); + ExFreePool(Urb); + return Status; + } + + HubInterfaceBusContext = HubDeviceExtension->HubInterface.BusContext; + + // Get the USBDI Interface + Status = QueryInterface(RootHubDeviceObject, + USB_BUS_INTERFACE_USBDI_GUID, + sizeof(USB_BUS_INTERFACE_USBDI_V2), + USB_BUSIF_USBDI_VERSION_2, + (PVOID)&HubDeviceExtension->UsbDInterface); + + if (!NT_SUCCESS(Status)) + { + // failed to get usbdi interface + DPRINT1("Failed to get USBDI_GUID interface with status 0x%08lx\n", Status); + ExFreePool(Urb); + return Status; + } + + UsbDInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; + + // Get Root Hub Device Handle + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, + &HubDeviceExtension->RootHubHandle, + NULL); + + if (!NT_SUCCESS(Status)) + { + // failed + DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE failed with status 0x%08lx\n", Status); + ExFreePool(Urb); + return Status; + } + + // + // Get Hub Device Information + // + Status = HubDeviceExtension->HubInterface.QueryDeviceInformation(HubInterfaceBusContext, + HubDeviceExtension->RootHubHandle, + &HubDeviceExtension->DeviceInformation, + sizeof(USB_DEVICE_INFORMATION_0), + &Result); + + DPRINT1("Status %x, Result 0x%08lx\n", Status, Result); + DPRINT1("InformationLevel %x\n", HubDeviceExtension->DeviceInformation.InformationLevel); + DPRINT1("ActualLength %x\n", HubDeviceExtension->DeviceInformation.ActualLength); + DPRINT1("PortNumber %x\n", HubDeviceExtension->DeviceInformation.PortNumber); + DPRINT1("DeviceDescriptor %x\n", HubDeviceExtension->DeviceInformation.DeviceDescriptor); + DPRINT1("HubAddress %x\n", HubDeviceExtension->DeviceInformation.HubAddress); + DPRINT1("NumberofPipes %x\n", HubDeviceExtension->DeviceInformation.NumberOfOpenPipes); + + // Get Root Hubs Device Descriptor + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_DEVICE_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubDeviceDescriptor, + NULL, + sizeof(USB_DEVICE_DESCRIPTOR), + NULL); + + // set device handle + Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; + + // get hub device descriptor + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + // failed to get device descriptor of hub + DPRINT1("Failed to get HubDeviceDescriptor!\n"); + ExFreePool(Urb); + return Status; + } + + // build configuration request + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_CONFIGURATION_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubConfigDescriptor, + NULL, + sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), + NULL); + + // set device handle + Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; + + // request configuration descriptor + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + // failed to get configuration descriptor + DPRINT1("Failed to get RootHub Configuration with status %x\n", Status); + ExFreePool(Urb); + return Status; + } + + // sanity checks + ASSERT(HubDeviceExtension->HubConfigDescriptor.wTotalLength == sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bNumInterfaces == 1); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bNumEndpoints == 1); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bmAttributes == USB_ENDPOINT_TYPE_INTERRUPT); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bEndpointAddress == 0x81); // interrupt in + + // get hub information + Status = HubDeviceExtension->HubInterface.GetExtendedHubInformation(HubInterfaceBusContext, + RootHubDeviceObject, + &HubDeviceExtension->UsbExtHubInfo, + sizeof(USB_EXTHUB_INFORMATION_0), + &Result); + if (!NT_SUCCESS(Status)) + { + // failed to get hub information + DPRINT1("Failed to extended hub information. Unable to determine the number of ports!\n"); + ExFreePool(Urb); + return Status; + } + + if (!HubDeviceExtension->UsbExtHubInfo.NumberOfPorts) + { + // bogus port driver + DPRINT1("Failed to retrieve the number of ports\n"); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("HubDeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", HubDeviceExtension->UsbExtHubInfo.NumberOfPorts); + + // Build hub descriptor request + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_DEVICE, + sizeof(Urb->UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + 0, + USB_REQUEST_GET_DESCRIPTOR, + USB_DEVICE_CLASS_RESERVED, + 0, + &HubDeviceExtension->HubDescriptor, + NULL, + sizeof(USB_HUB_DESCRIPTOR), + NULL); + + // set device handle + Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; + + // send request + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Descriptor!\n"); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + // sanity checks + ASSERT(HubDeviceExtension->HubDescriptor.bDescriptorLength == sizeof(USB_HUB_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubDescriptor.bNumberOfPorts == HubDeviceExtension->UsbExtHubInfo.NumberOfPorts); + ASSERT(HubDeviceExtension->HubDescriptor.bDescriptorType == 0x29); + + // build get status request + HubStatus = 0; + UsbBuildGetStatusRequest(Urb, + URB_FUNCTION_GET_STATUS_FROM_DEVICE, + 0, + &HubStatus, + 0, + NULL); + // set device handle + Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; + + // send request + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + if (!NT_SUCCESS(Status)) + { + // failed to get hub status + DPRINT1("Failed to get Hub Status!\n"); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + // Allocate memory for PortStatusChange to hold 2 USHORTs for each port on hub + HubDeviceExtension->PortStatusChange = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ULONG) * HubDeviceExtension->UsbExtHubInfo.NumberOfPorts, + USB_HUB_TAG); + + // Get the first Configuration Descriptor + Pid = USBD_ParseConfigurationDescriptorEx(&HubDeviceExtension->HubConfigDescriptor, + &HubDeviceExtension->HubConfigDescriptor, + -1, -1, -1, -1, -1); + if (Pid == NULL) + { + // failed parse hub descriptor + DPRINT1("Failed to parse configuration descriptor\n"); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + // create configuration request + InterfaceList[0].InterfaceDescriptor = Pid; + ConfigUrb = USBD_CreateConfigurationRequestEx(&HubDeviceExtension->HubConfigDescriptor, + (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); + if (ConfigUrb == NULL) + { + // failed to build urb + DPRINT1("Failed to allocate urb\n"); + ExFreePool(Urb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // send request + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + ConfigUrb, + NULL); + if (!NT_SUCCESS(Status)) + { + // failed to select configuration + DPRINT1("Failed to select configuration with %x\n", Status); + ExFreePool(Urb); + ExFreePool(ConfigUrb); + return Status; + } + + // store configuration & pipe handle + HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; + HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; + DPRINT("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + + // free urb + ExFreePool(ConfigUrb); + + // check if function is available + if (HubDeviceExtension->UsbDInterface.IsDeviceHighSpeed) + { + // is it high speed bus + if (HubDeviceExtension->UsbDInterface.IsDeviceHighSpeed(HubInterfaceBusContext)) + { + // initialize usb 2.0 hub + Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubInterfaceBusContext, + HubDeviceExtension->RootHubHandle, 1); + DPRINT("Status %x\n", Status); + + // FIXME handle error + ASSERT(Status == STATUS_SUCCESS); + } + } + + + // Enable power on all ports + DPRINT("Enabling PortPower on all ports!\n"); + for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) + { + Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_POWER); + if (!NT_SUCCESS(Status)) + DPRINT1("Failed to power on port %d\n", PortId); + + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_CONNECTION); + if (!NT_SUCCESS(Status)) + DPRINT1("Failed to power on port %d\n", PortId); + } + + // init root hub notification + if (HubDeviceExtension->HubInterface.RootHubInitNotification) + { + Status = HubDeviceExtension->HubInterface.RootHubInitNotification(HubInterfaceBusContext, + DeviceObject, + RootHubInitCallbackFunction); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set callback\n"); + ExFreePool(Urb); + return Status; + } + } + else + { + // Send the first SCE Request + QueryStatusChangeEndpoint(DeviceObject); + + // + // reset ports + // + for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) + { + // + // get port status + // + Status = GetPortStatusAndChange(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, &StatusChange); + if (NT_SUCCESS(Status)) + { + // + // is there a device connected + // + if (StatusChange.Status & USB_PORT_STATUS_CONNECT) + { + // + // reset port + // + Status = SetPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, PORT_RESET); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reset on port %d\n", PortId); + } + else + { + // + // wait for the reset to be handled since we want to enumerate synchronously + // + KeWaitForSingleObject(&HubDeviceExtension->ResetComplete, + Executive, + KernelMode, + FALSE, + NULL); + KeClearEvent(&HubDeviceExtension->ResetComplete); + } + } + } + } + } + + // free urb + ExFreePool(Urb); + + // done + return Status; +} + +NTSTATUS USBHUB_FdoHandlePnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -1511,9 +1960,6 @@ NTSTATUS Status = STATUS_SUCCESS; ULONG_PTR Information = 0; PHUB_DEVICE_EXTENSION HubDeviceExtension; - PDEVICE_OBJECT RootHubDeviceObject; - PVOID HubInterfaceBusContext , UsbDInterfaceBusContext; - PORT_STATUS_CHANGE StatusChange; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -1523,380 +1969,7 @@ { case IRP_MN_START_DEVICE: { - PURB Urb; - PUSB_INTERFACE_DESCRIPTOR Pid; - ULONG Result = 0, PortId; - USBD_INTERFACE_LIST_ENTRY InterfaceList[2] = {{NULL, NULL}, {NULL, NULL}}; - PURB ConfigUrb = NULL; - ULONG HubStatus; - - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - - // - // Allocated size including the sizeof USBD_INTERFACE_LIST_ENTRY - // - Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY), USB_HUB_TAG); - RtlZeroMemory(Urb, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY)); - - // - // Get the Root Hub Pdo - // - SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, - IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, - &HubDeviceExtension->RootHubPhysicalDeviceObject, - &HubDeviceExtension->RootHubFunctionalDeviceObject); - - RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; - ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject); - ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject); - DPRINT("RootPdo %x, RootFdo %x\n", - HubDeviceExtension->RootHubPhysicalDeviceObject, - HubDeviceExtension->RootHubFunctionalDeviceObject); - - // - // Send the StartDevice to RootHub - // - Status = ForwardIrpAndWait(RootHubDeviceObject, Irp); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to start the RootHub PDO\n"); - ASSERT(FALSE); - } - - // - // Get the current number of hubs - // - Status = SubmitRequestToRootHub(RootHubDeviceObject, - IOCTL_INTERNAL_USB_GET_HUB_COUNT, - &HubDeviceExtension->NumberOfHubs, NULL); - - // - // Get the Hub Interface - // - Status = QueryInterface(RootHubDeviceObject, - USB_BUS_INTERFACE_HUB_GUID, - sizeof(USB_BUS_INTERFACE_HUB_V5), - USB_BUSIF_HUB_VERSION_5, - (PVOID)&HubDeviceExtension->HubInterface); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get HUB_GUID interface with status 0x%08lx\n", Status); - return STATUS_UNSUCCESSFUL; - } - - HubInterfaceBusContext = HubDeviceExtension->HubInterface.BusContext; - - // - // Get the USBDI Interface - // - Status = QueryInterface(RootHubDeviceObject, - USB_BUS_INTERFACE_USBDI_GUID, - sizeof(USB_BUS_INTERFACE_USBDI_V2), - USB_BUSIF_USBDI_VERSION_2, - (PVOID)&HubDeviceExtension->UsbDInterface); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get USBDI_GUID interface with status 0x%08lx\n", Status); - return Status; - } - - UsbDInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; - - // - // Get Root Hub Device Handle - // - Status = SubmitRequestToRootHub(RootHubDeviceObject, - IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, - &HubDeviceExtension->RootHubHandle, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("GetRootHubDeviceHandle failed with status 0x%08lx\n", Status); - return Status; - } - - // - // Get Hub Device Information - // - Status = HubDeviceExtension->HubInterface.QueryDeviceInformation(HubInterfaceBusContext, - HubDeviceExtension->RootHubHandle, - &HubDeviceExtension->DeviceInformation, - sizeof(USB_DEVICE_INFORMATION_0), - &Result); - - DPRINT1("Status %x, Result 0x%08lx\n", Status, Result); - DPRINT1("InformationLevel %x\n", HubDeviceExtension->DeviceInformation.InformationLevel); - DPRINT1("ActualLength %x\n", HubDeviceExtension->DeviceInformation.ActualLength); - DPRINT1("PortNumber %x\n", HubDeviceExtension->DeviceInformation.PortNumber); - DPRINT1("DeviceDescriptor %x\n", HubDeviceExtension->DeviceInformation.DeviceDescriptor); - DPRINT1("HubAddress %x\n", HubDeviceExtension->DeviceInformation.HubAddress); - DPRINT1("NumberofPipes %x\n", HubDeviceExtension->DeviceInformation.NumberOfOpenPipes); - - // - // Get Root Hubs Device Descriptor - // - UsbBuildGetDescriptorRequest(Urb, - sizeof(Urb->UrbControlDescriptorRequest), - USB_DEVICE_DESCRIPTOR_TYPE, - 0, - 0, - &HubDeviceExtension->HubDeviceDescriptor, - NULL, - sizeof(USB_DEVICE_DESCRIPTOR), - NULL); - - Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(RootHubDeviceObject, - IOCTL_INTERNAL_USB_SUBMIT_URB, - Urb, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get HubDeviceDescriptor!\n"); - } - - DumpDeviceDescriptor(&HubDeviceExtension->HubDeviceDescriptor); - - // - // Get Root Hubs Configuration Descriptor - // - UsbBuildGetDescriptorRequest(Urb, - sizeof(Urb->UrbControlDescriptorRequest), - USB_CONFIGURATION_DESCRIPTOR_TYPE, - 0, - 0, - &HubDeviceExtension->HubConfigDescriptor, - NULL, - sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), - NULL); - - DPRINT("RootHub Handle %x\n", HubDeviceExtension->RootHubHandle); - Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(RootHubDeviceObject, - IOCTL_INTERNAL_USB_SUBMIT_URB, - Urb, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get RootHub Configuration with status %x\n", Status); - ASSERT(FALSE); - } - ASSERT(HubDeviceExtension->HubConfigDescriptor.wTotalLength); - - DumpConfigurationDescriptor(&HubDeviceExtension->HubConfigDescriptor); - - Status = HubDeviceExtension->HubInterface.GetExtendedHubInformation(HubInterfaceBusContext, - RootHubDeviceObject, - &HubDeviceExtension->UsbExtHubInfo, - sizeof(USB_EXTHUB_INFORMATION_0), - &Result); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to extended hub information. Unable to determine the number of ports!\n"); - ASSERT(FALSE); - } - - DPRINT1("HubDeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", HubDeviceExtension->UsbExtHubInfo.NumberOfPorts); - - // - // Get the Hub Descriptor - // - UsbBuildVendorRequest(Urb, - URB_FUNCTION_CLASS_DEVICE, - sizeof(Urb->UrbControlVendorClassRequest), - USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, - 0, - USB_REQUEST_GET_DESCRIPTOR, - USB_DEVICE_CLASS_RESERVED, - 0, - &HubDeviceExtension->HubDescriptor, - NULL, - sizeof(USB_HUB_DESCRIPTOR), - NULL); - - Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(RootHubDeviceObject, - IOCTL_INTERNAL_USB_SUBMIT_URB, - Urb, - NULL); - - DPRINT1("bDescriptorType %x\n", HubDeviceExtension->HubDescriptor.bDescriptorType); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get Hub Descriptor!\n"); - ExFreePool(Urb); - return STATUS_UNSUCCESSFUL; - } - - HubStatus = 0; - UsbBuildGetStatusRequest(Urb, - URB_FUNCTION_GET_STATUS_FROM_DEVICE, - 0, - &HubStatus, - 0, - NULL); - Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(RootHubDeviceObject, - IOCTL_INTERNAL_USB_SUBMIT_URB, - Urb, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get Hub Status!\n"); - ExFreePool(Urb); - return STATUS_UNSUCCESSFUL; - } - - DPRINT1("HubStatus %x\n", HubStatus); - - // - // Allocate memory for PortStatusChange to hold 2 USHORTs for each port on hub - // - HubDeviceExtension->PortStatusChange = ExAllocatePoolWithTag(NonPagedPool, - sizeof(ULONG) * HubDeviceExtension->UsbExtHubInfo.NumberOfPorts, - USB_HUB_TAG); - - // - // Get the first Configuration Descriptor - // - Pid = USBD_ParseConfigurationDescriptorEx(&HubDeviceExtension->HubConfigDescriptor, - &HubDeviceExtension->HubConfigDescriptor, - -1, -1, -1, -1, -1); - - ASSERT(Pid != NULL); - - InterfaceList[0].InterfaceDescriptor = Pid; - ConfigUrb = USBD_CreateConfigurationRequestEx(&HubDeviceExtension->HubConfigDescriptor, - (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); - ASSERT(ConfigUrb != NULL); - - Status = SubmitRequestToRootHub(RootHubDeviceObject, - IOCTL_INTERNAL_USB_SUBMIT_URB, - ConfigUrb, - NULL); - - HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; - HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; - DPRINT("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); - - // - // check if function is available - // - if (HubDeviceExtension->UsbDInterface.IsDeviceHighSpeed) - { - // - // is it high speed bus - // - if (HubDeviceExtension->UsbDInterface.IsDeviceHighSpeed(HubInterfaceBusContext)) - { - // - // initialize usb 2.0 hub - // - Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubInterfaceBusContext, - HubDeviceExtension->RootHubHandle, 1); - DPRINT("Status %x\n", Status); - - // - // FIXME handle error - // - ASSERT(Status == STATUS_SUCCESS); - } - } - - ExFreePool(ConfigUrb); - - // - // Enable power on all ports - // - - DPRINT("Enabling PortPower on all ports!\n"); - - for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) - { - Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_POWER); - if (!NT_SUCCESS(Status)) - DPRINT1("Failed to power on port %d\n", PortId); - - Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_CONNECTION); - if (!NT_SUCCESS(Status)) - DPRINT1("Failed to power on port %d\n", PortId); - } - - DPRINT("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification); - - // - // init root hub notification - // - if (HubDeviceExtension->HubInterface.RootHubInitNotification) - { - Status = HubDeviceExtension->HubInterface.RootHubInitNotification(HubInterfaceBusContext, - DeviceObject, - RootHubInitCallbackFunction); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to set callback\n"); - } - } - else - { - // - // Send the first SCE Request - // - QueryStatusChangeEndpoint(DeviceObject); - - // - // reset ports - // - for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) - { - // - // get port status - // - Status = GetPortStatusAndChange(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, &StatusChange); - if (NT_SUCCESS(Status)) - { - // - // is there a device connected - // - if (StatusChange.Status & USB_PORT_STATUS_CONNECT) - { - // - // reset port - // - Status = SetPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, PORT_RESET); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to reset on port %d\n", PortId); - } - else - { - // - // wait for the reset to be handled since we want to enumerate synchronously - // - KeWaitForSingleObject(&HubDeviceExtension->ResetComplete, - Executive, - KernelMode, - FALSE, - NULL); - KeClearEvent(&HubDeviceExtension->ResetComplete); - } - } - } - } - } - - ExFreePool(Urb); + Status = USBHUB_FdoStartDevice(DeviceObject, Irp); break; } Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Wed Feb 29 17:08:32 2012 @@ -836,7 +836,7 @@ // // Is the Request for the root hub // - if (Urb->UrbHeader.UsbdDeviceHandle == 0) + if (Urb->UrbHeader.UsbdDeviceHandle == PVOID(this)) { ASSERT(m_PendingSCEIrp == NULL); if (QueryStatusChageEndpoint(Irp)) @@ -1179,7 +1179,7 @@ DeviceStatus = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; - if (Urb->UrbHeader.UsbdDeviceHandle == NULL) + if (Urb->UrbHeader.UsbdDeviceHandle == PVOID(this)) { // // FIXME need more flags ? @@ -1311,46 +1311,66 @@ case USB_DEVICE_CLASS_RESERVED: // FALL THROUGH case USB_DEVICE_CLASS_HUB: { - // - // sanity checks - // - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)); - - // - // get hub descriptor - // - UsbHubDescriptor = (PUSB_HUB_DESCRIPTOR)Urb->UrbControlVendorClassRequest.TransferBuffer; - - // - // one hub is handled - // - UsbHubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); - Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); - - // - // type should 0x29 according to msdn - // - UsbHubDescriptor->bDescriptorType = 0x29; - - // - // get port count - // - Status = m_Hardware->GetDeviceDetails(&Dummy1, &Dummy1, &PortCount, &Dummy2); - PC_ASSERT(Status == STATUS_SUCCESS); - - // - // FIXME: retrieve values - // - UsbHubDescriptor->bNumberOfPorts = (UCHAR)PortCount; - UsbHubDescriptor->wHubCharacteristics = 0x00; - UsbHubDescriptor->bPowerOnToPowerGood = 0x01; - UsbHubDescriptor->bHubControlCurrent = 0x00; - - // - // done - // - Status = STATUS_SUCCESS; + if (Urb->UrbHeader.UsbdDeviceHandle == PVOID(this)) + { + // + // sanity checks + // + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)); + + // + // get hub descriptor + // + UsbHubDescriptor = (PUSB_HUB_DESCRIPTOR)Urb->UrbControlVendorClassRequest.TransferBuffer; + + // + // one hub is handled + // + UsbHubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); + Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); + + // + // type should 0x29 according to msdn + // + UsbHubDescriptor->bDescriptorType = 0x29; + + // + // get port count + // + Status = m_Hardware->GetDeviceDetails(&Dummy1, &Dummy1, &PortCount, &Dummy2); + PC_ASSERT(Status == STATUS_SUCCESS); + + // + // FIXME: retrieve values + // + UsbHubDescriptor->bNumberOfPorts = (UCHAR)PortCount; + UsbHubDescriptor->wHubCharacteristics = 0x00; + UsbHubDescriptor->bPowerOnToPowerGood = 0x01; + UsbHubDescriptor->bHubControlCurrent = 0x00; + + // + // done + // + Status = STATUS_SUCCESS; + } + else + { + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // FIXME: implement support for real hubs + // + UNIMPLEMENTED + Status = STATUS_NOT_IMPLEMENTED; + } break; } default: @@ -1450,7 +1470,7 @@ PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_DEVICE_DESCRIPTOR)); PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); - if (Urb->UrbHeader.UsbdDeviceHandle == NULL) + if (Urb->UrbHeader.UsbdDeviceHandle == PVOID(this)) { // // copy root hub device descriptor @@ -1494,7 +1514,7 @@ PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_CONFIGURATION_DESCRIPTOR)); - if (Urb->UrbHeader.UsbdDeviceHandle == NULL) + if (Urb->UrbHeader.UsbdDeviceHandle == PVOID(this)) { // // request is for the root bus controller

12 years, 10 months

[sir_richard] 55922: [NTOS]: Define the Decommitted PTE structure.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Feb 29 16:58:46 2012 New Revision: 55922 URL: http://svn.reactos.org/svn/reactos?rev=55922&view=rev Log: [NTOS]: Define the Decommitted PTE structure. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Feb 29 16:58:46 2012 @@ -29,6 +29,8 @@ MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; +/* Template PTE for decommited page */ +MMPTE MmDecommittedPte = {{MM_DECOMMIT << MM_PTE_SOFTWARE_PROTECTION_BITS}}; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Feb 29 16:58:46 2012 @@ -479,6 +479,7 @@ extern MMPDE DemandZeroPde; extern MMPTE DemandZeroPte; extern MMPTE PrototypePte; +extern MMPTE MmDecommittedPte; extern BOOLEAN MmLargeSystemCache; extern BOOLEAN MmZeroPageFile; extern BOOLEAN MmProtectFreedNonPagedPool; @@ -1329,6 +1330,12 @@ OUT PPFN_NUMBER ValidPages ); +ULONG +NTAPI +MiGetPageProtection( + IN PMMPTE PointerPte +); + PLDR_DATA_TABLE_ENTRY NTAPI MiLookupDataTableEntry(

12 years, 10 months

[ion] 55921: [NTOSKRNL]: Fix broken UsedPageTableEntries/page table ref counting ASSERTs. The reference can be UP TO 1024, inclusive, but no more. This might fix a bunch of assertions related to th...

by ion＠svn.reactos.org

Author: ion Date: Wed Feb 29 16:25:43 2012 New Revision: 55921 URL: http://svn.reactos.org/svn/reactos?rev=55921&view=rev Log: [NTOSKRNL]: Fix broken UsedPageTableEntries/page table ref counting ASSERTs. The reference can be UP TO 1024, inclusive, but no more. This might fix a bunch of assertions related to this. Thanks to Richard for catching this one during his VAD work. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Feb 29 16:25:43 2012 @@ -412,7 +412,7 @@ { DPRINT("Decrement used PTEs by address: %lx\n", Va); (*UsedPageTableEntries)--; - ASSERT((*UsedPageTableEntries) < PTE_COUNT); + ASSERT((*UsedPageTableEntries) <= PTE_COUNT); DPRINT("Refs: %lx\n", (*UsedPageTableEntries)); /* Check if the PTE is actually mapped in */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Feb 29 16:25:43 2012 @@ -1978,7 +1978,7 @@ if((Address < MmSystemRangeStart) && (Process != PageOutContext->CallingProcess)) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); } #endif @@ -2158,7 +2158,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); } #endif MmSetSavedSwapEntryPage(Page, 0); @@ -2186,7 +2186,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); } #endif MmSetSavedSwapEntryPage(Page, 0); @@ -2209,7 +2209,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); } #endif if (SwapEntry != 0) @@ -2247,7 +2247,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); } #endif MmReleasePageMemoryConsumer(MC_USER, Page); @@ -2413,7 +2413,7 @@ if(Address < MmSystemRangeStart) { Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); } #endif Entry = MAKE_SWAP_SSE(SwapEntry);

12 years, 10 months

[janderwald] 55920: [USBUHCI] - Try fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 29 16:15:05 2012 New Revision: 55920 URL: http://svn.reactos.org/svn/reactos?rev=55920&view=rev Log: [USBUHCI] - Try fix build Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Wed Feb 29 16:15:05 2012 @@ -1487,6 +1487,7 @@ } NTSTATUS +NTAPI CreateUSBHardware( PUSBHARDWAREDEVICE *OutHardware) { Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Wed Feb 29 16:15:05 2012 @@ -518,6 +518,7 @@ } NTSTATUS +NTAPI CreateUSBQueue( PUSBQUEUE *OutUsbQueue) { Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Wed Feb 29 16:15:05 2012 @@ -1385,6 +1385,7 @@ //----------------------------------------------------------------------------------------- NTSTATUS +NTAPI InternalCreateUSBRequest( PUSBREQUEST *OutRequest) { Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] Wed Feb 29 16:15:05 2012 @@ -61,16 +61,16 @@ // // hardware.cpp // -NTSTATUS CreateUSBHardware(PUSBHARDWAREDEVICE *OutHardware); +NTSTATUS NTAPI CreateUSBHardware(PUSBHARDWAREDEVICE *OutHardware); // // usb_queue.cpp // -NTSTATUS CreateUSBQueue(PUSBQUEUE *OutUsbQueue); +NTSTATUS NTAPI CreateUSBQueue(PUSBQUEUE *OutUsbQueue); // // usb_request.cpp // -NTSTATUS InternalCreateUSBRequest(PUSBREQUEST *OutRequest); +NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest); #endif

12 years, 10 months

[tkreuzer] 55919: [GDI32] Fix MSVC warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 29 15:34:43 2012 New Revision: 55919 URL: http://svn.reactos.org/svn/reactos?rev=55919&view=rev Log: [GDI32] Fix MSVC warnings Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Wed Feb 29 15:34:43 2012 @@ -378,15 +378,15 @@ _lrintf(float f) { #if defined(_M_IX86) && defined(__GNUC__) - int ret; - __asm__ __volatile__ ("fistpl %0" : "=m" (ret) : "t" (f) : "st"); - return ret; + int result; + __asm__ __volatile__ ("fistpl %0" : "=m" (result) : "t" (f) : "st"); + return result; #elif defined(_M_IX86) && defined(_MSC_VER) - int ret; + int result; __asm { fld f; - fistp ret; + fistp result; } #else /* slow, but portable */

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012