Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[janderwald] 55828: [USBUHCI] - OHCI -> UHCI - Implement timer routine which checks for new detected devices. In case a port change is detected, the sce callback routine is invoked
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 01:27:19 2012 New Revision: 55828 URL: http://svn.reactos.org/svn/reactos?rev=55828&view=rev Log: [USBUHCI] - OHCI -> UHCI - Implement timer routine which checks for new detected devices. In case a port change is detected, the sce callback routine is invoked Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp trunk/reactos/drivers/usb/usbuhci/misc.cpp trunk/reactos/drivers/usb/usbuhci/purecall.cpp trunk/reactos/drivers/usb/usbuhci/usb_device.cpp trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.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] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/hcd_controller.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/hcd_controller.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -22,7 +22,7 @@ VOID NTAPI -OhciDefferedRoutine( +UhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, @@ -30,7 +30,18 @@ VOID NTAPI +TimerDpcRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2); + + +VOID +NTAPI StatusChangeWorkItemRoutine(PVOID Context); + + class CUSBHardwareDevice : public IUSBHardwareDevice { @@ -86,7 +97,8 @@ // friend function friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); - friend VOID NTAPI OhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); + friend VOID NTAPI UhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); + friend VOID NTAPI TimerDpcRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); friend VOID NTAPI StatusChangeWorkItemRoutine(PVOID Context); VOID WriteRegister8(IN ULONG Register, IN UCHAR value); VOID WriteRegister16(ULONG Register, USHORT Value); @@ -120,7 +132,7 @@ PDMAMEMORYMANAGER m_MemoryManager; // memory manager HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context - WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback + //WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback ULONG m_InterruptMask; // interrupt enabled mask ULONG m_PortResetChange; // port reset status PULONG m_FrameList; // frame list @@ -129,6 +141,8 @@ PUHCI_QUEUE_HEAD m_QueueHead[5]; // queue heads PHYSICAL_ADDRESS m_StrayDescriptorPhysicalAddress; // physical address stray descriptor PUHCI_TRANSFER_DESCRIPTOR m_StrayDescriptor; // stray descriptor + KTIMER m_SCETimer; // SCE timer + KDPC m_SCETimerDpc; // timer dpc }; //================================================================================================= @@ -200,7 +214,15 @@ // // intialize status change work item // - ExInitializeWorkItem(&m_StatusChangeWorkItem, StatusChangeWorkItemRoutine, PVOID(this)); + //ExInitializeWorkItem(&m_StatusChangeWorkItem, StatusChangeWorkItemRoutine, PVOID(this)); + + + // initialize timer + KeInitializeTimer(&m_SCETimer); + + // initialize timer dpc + KeInitializeDpc(&m_SCETimerDpc, TimerDpcRoutine, PVOID(this)); + m_VendorID = 0; m_DeviceID = 0; @@ -258,7 +280,7 @@ case CmResourceTypeInterrupt: { KeInitializeDpc(&m_IntDpcObject, - OhciDefferedRoutine, + UhciDefferedRoutine, this); Status = IoConnectInterrupt(&m_Interrupt, @@ -537,6 +559,13 @@ DPRINT1("[USBUHCI] Controller Frame %x\n", ReadRegister16(UHCI_FRNUM)); DPRINT1("[USBUHCI] Controller Port Status 0 %x\n", ReadRegister16(UHCI_PORTSC1)); DPRINT1("[USBUHCI] Controller Port Status 1 %x\n", ReadRegister16(UHCI_PORTSC1 + 2)); + + + // queue timer + LARGE_INTEGER Expires; + Expires.QuadPart = -10 * 10000; + + KeSetTimerEx(&m_SCETimer, Expires, 1000, &m_SCETimerDpc); // // done @@ -979,8 +1008,9 @@ } m_PortResetChange |= (1 << PortIndex); - DPRINT1("[USBOHCI] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); - + DPRINT1("[USBUhci] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); + +#if 0 if (Status & UHCI_PORTSC_CURSTAT) { // @@ -989,6 +1019,7 @@ DPRINT1("Queueing work item\n"); ExQueueWorkItem(&m_StatusChangeWorkItem, DelayedWorkQueue); } +#endif return STATUS_SUCCESS; } @@ -1023,7 +1054,7 @@ // read port status // Status = ReadRegister16(UHCI_PORTSC1 + PortId * 2); - DPRINT1("[USBUHCI] PortId %x Status %x\n", PortId, Status); + DPRINT("[USBUHCI] PortId %x Status %x\n", PortId, Status); // build the status if (Status & UHCI_PORTSC_CURSTAT) @@ -1398,7 +1429,7 @@ VOID NTAPI -OhciDefferedRoutine( +UhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, @@ -1412,7 +1443,7 @@ // This = (CUSBHardwareDevice*)DeferredContext; - DPRINT("OhciDefferedRoutine\n"); + DPRINT("UhciDefferedRoutine\n"); // // get status @@ -1432,6 +1463,40 @@ // DPRINT1("[USBUHCI] Status %x not handled\n", Status); } + +VOID +NTAPI +TimerDpcRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + CUSBHardwareDevice *This; + USHORT PortStatus = 0; + USHORT PortChange = 0; + + // get parameters + This = (CUSBHardwareDevice*)DeferredContext; + + // check port 0 + This->GetPortStatus(0, &PortStatus, &PortChange); + if (PortChange) + { + // invoke status change work item routine + StatusChangeWorkItemRoutine(DeferredContext); + return; + } + + // check port 1 + This->GetPortStatus(1, &PortStatus, &PortChange); + if (PortChange) + { + // invoke status change work item routine + StatusChangeWorkItemRoutine(DeferredContext); + } +} + VOID NTAPI @@ -1462,7 +1527,7 @@ { PUSBHARDWAREDEVICE This; - This = new(NonPagedPool, TAG_USBOHCI) CUSBHardwareDevice(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBHardwareDevice(0); if (!This) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/hcd_controller.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/hcd_controller.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -755,7 +755,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CHCDController(0); + This = new(NonPagedPool, TAG_USBUHCI) CHCDController(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hub_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/hub_controller.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/hub_controller.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -209,7 +209,7 @@ // // allocate device address bitmap buffer // - m_DeviceAddressBitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, 16, TAG_USBOHCI); + m_DeviceAddressBitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, 16, TAG_USBUHCI); if (!m_DeviceAddressBitmapBuffer) { // @@ -484,7 +484,7 @@ // // allocate buffer // - DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), TAG_USBOHCI); + DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), TAG_USBUHCI); if (!DeviceName) { @@ -556,7 +556,7 @@ // // allocate buffer // - DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Index * sizeof(WCHAR), TAG_USBOHCI); + DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Index * sizeof(WCHAR), TAG_USBUHCI); if (!DeviceName) { @@ -664,7 +664,7 @@ // // allocate device relations // - DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), TAG_USBOHCI); + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), TAG_USBUHCI); if (!DeviceRelations) { // @@ -1746,7 +1746,7 @@ // // abort pipe failed // - DPRINT1("[USBOHCI] AbortPipe failed with %x\n", Status); + DPRINT1("[USBUHCI] AbortPipe failed with %x\n", Status); } // @@ -2288,7 +2288,7 @@ // // free entry // - ExFreePoolWithTag(DeviceEntry, TAG_USBOHCI); + ExFreePoolWithTag(DeviceEntry, TAG_USBUHCI); // // done @@ -2383,7 +2383,7 @@ // // allocate device entry // - DeviceEntry = (PUSBDEVICE_ENTRY)ExAllocatePoolWithTag(NonPagedPool, sizeof(USBDEVICE_ENTRY), TAG_USBOHCI); + DeviceEntry = (PUSBDEVICE_ENTRY)ExAllocatePoolWithTag(NonPagedPool, sizeof(USBDEVICE_ENTRY), TAG_USBUHCI); if (!DeviceEntry) { // @@ -3693,7 +3693,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CHubController(0); + This = new(NonPagedPool, TAG_USBUHCI) CHubController(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/memory… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/memory_manager.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/memory_manager.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -90,7 +90,7 @@ // // allocate bitmap buffer // - m_BitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, BitmapLength, TAG_USBOHCI); + m_BitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, BitmapLength, TAG_USBUHCI); if (!m_BitmapBuffer) { // @@ -342,7 +342,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CDMAMemoryManager(0); + This = new(NonPagedPool, TAG_USBUHCI) CDMAMemoryManager(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/misc.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/misc.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/misc.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/drivers/usb/usbuhci/purecall.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/pureca… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/purecall.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/purecall.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/purecall.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/purecall.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/drivers/usb/usbuhci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usb_device.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usb_device.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -115,7 +115,7 @@ // abort pipe // //Status = AbortPipe((PUSB_ENDPOINT_DESCRIPTOR)&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndpointIndex]); - //DPRINT1("[USBOHCI] Deleting Device Abort Pipe Status %x\n", Status); + //DPRINT1("[USBUHCI] Deleting Device Abort Pipe Status %x\n", Status); } if (m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints) @@ -373,7 +373,7 @@ DPRINT1("CUSBDevice::SetDeviceAddress Address %d\n", DeviceAddress); - CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBOHCI); + CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBUHCI); if (!CtrlSetup) return STATUS_INSUFFICIENT_RESOURCES; @@ -396,7 +396,7 @@ // // free setup packet // - ExFreePoolWithTag(CtrlSetup, TAG_USBOHCI); + ExFreePoolWithTag(CtrlSetup, TAG_USBUHCI); // // check for success @@ -451,7 +451,7 @@ // // allocate configuration descriptor // - m_ConfigurationDescriptors = (PUSB_CONFIGURATION) ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations, TAG_USBOHCI); + m_ConfigurationDescriptors = (PUSB_CONFIGURATION) ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations, TAG_USBUHCI); // // zero configuration descriptor @@ -767,7 +767,7 @@ // // first allocate a buffer which should be enough to store all different interfaces and endpoints // - Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_USBOHCI); + Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_USBUHCI); if (!Buffer) { // @@ -798,7 +798,7 @@ // // failed to allocate mdl // - ExFreePoolWithTag(Buffer, TAG_USBOHCI); + ExFreePoolWithTag(Buffer, TAG_USBUHCI); return STATUS_INSUFFICIENT_RESOURCES; } @@ -891,7 +891,7 @@ // // now allocate interface descriptors // - m_ConfigurationDescriptors[Index].Interfaces = (PUSB_INTERFACE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces, TAG_USBOHCI); + m_ConfigurationDescriptors[Index].Interfaces = (PUSB_INTERFACE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces, TAG_USBUHCI); if (!m_ConfigurationDescriptors[Index].Interfaces) { // @@ -940,7 +940,7 @@ // // allocate end point descriptors // - m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBOHCI); + m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBUHCI); if (!m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints) { // @@ -1408,7 +1408,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CUSBDevice(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBDevice(0); if (!This) { // 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] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usb_queue.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usb_queue.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -544,7 +544,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CUSBQueue(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBQueue(0); if (!This) { // 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] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usb_request.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usb_request.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -192,7 +192,7 @@ // // allocate completion event // - m_CompletionEvent = (PKEVENT)ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_USBOHCI); + m_CompletionEvent = (PKEVENT)ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_USBUHCI); if (!m_CompletionEvent) { // @@ -1395,7 +1395,7 @@ // // allocate requests // - This = new(NonPagedPool, TAG_USBOHCI) CUSBRequest(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBRequest(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usbohci.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usbohci.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) 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] Thu Feb 23 01:27:19 2012 @@ -1,5 +1,5 @@ -#ifndef USBOHCI_H__ -#define USBOHCI_H__ +#ifndef USBUHCI_H__ +#define USBUHCI_H__ #include <ntddk.h> #define NDEBUG @@ -56,7 +56,7 @@ // // tag for allocations // -#define TAG_USBOHCI 'ICHO' +#define TAG_USBUHCI 'ICHO' // // assert for c++ - taken from portcls

1 0

[cgutman] 55827: [NTOSKRNL] - Reenable and fix the correct reset code [HIDCLASS] - Disable removal of PDOs due to IRP cancellation issues [USBEHCI][USBOHCI][USBUHCI] - Disable removal of FDOs due t...
by cgutman＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: cgutman Date: Thu Feb 23 01:23:30 2012 New Revision: 55827 URL: http://svn.reactos.org/svn/reactos?rev=55827&view=rev Log: [NTOSKRNL] - Reenable and fix the correct reset code [HIDCLASS] - Disable removal of PDOs due to IRP cancellation issues [USBEHCI][USBOHCI][USBUHCI] - Disable removal of FDOs due to reinitialization issues Modified: trunk/reactos/drivers/hid/hidclass/pdo.c trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -580,7 +580,12 @@ // // no/op // +#if 0 Status = STATUS_SUCCESS; +#else + DPRINT1("Denying removal of HID device due to IRP cancellation bugs\n"); + Status = STATUS_UNSUCCESSFUL; +#endif break; } default: Modified: trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -537,6 +537,7 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { +#if 0 // // sure // @@ -547,6 +548,12 @@ // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); +#else + DPRINT1("Denying controller removal due to reinitialization bugs\n"); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +#endif } case IRP_MN_REMOVE_DEVICE: { Modified: trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -537,6 +537,7 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { +#if 0 // // sure // @@ -547,6 +548,12 @@ // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); +#else + DPRINT1("Denying controller removal due to reinitialization bugs\n"); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +#endif } case IRP_MN_REMOVE_DEVICE: { Modified: trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -537,6 +537,7 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { +#if 0 // // sure // @@ -547,6 +548,12 @@ // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); +#else + DPRINT1("Denying controller removal due to reinitialization bugs\n"); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +#endif } case IRP_MN_REMOVE_DEVICE: { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -555,38 +555,37 @@ ASSERT(DeviceNode->Flags & DNF_ENUMERATED); ASSERT(DeviceNode->Flags & DNF_PROCESSED); -#if 0 - /* Remove the device node */ - Status = IopRemoveDevice(DeviceNode); - if (NT_SUCCESS(Status)) - { - /* Invalidate device relations for the parent to reenumerate the device */ - Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); - DPRINT1("A new driver has been loaded for '%wZ'\n", &DeviceInstance); - } -#else - /* FIXME: We might clear some important flags */ - DeviceNode->Flags &= ~DNF_DISABLED; - - /* Load service data from the registry */ - Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); - - if (NT_SUCCESS(Status)) - { - /* Start the service and begin PnP initialization of the device again */ - Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); - DPRINT1("HACK: A new driver has been loaded for '%wZ' WITHOUT removing the old one\n", &DeviceInstance); - } -#endif - else if (DeviceNode->Flags & DNF_ADDED) - { - /* A driver has already been loaded for this device */ - DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceInstance); + /* Check if there's already a driver loaded for this device */ + if (DeviceNode->Flags & DNF_ADDED) + { + /* Remove the device node */ + Status = IopRemoveDevice(DeviceNode); + if (NT_SUCCESS(Status)) + { + /* Invalidate device relations for the parent to reenumerate the device */ + Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); + DPRINT1("A new driver has been loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); + } + else + { + /* A driver has already been loaded for this device */ + DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); + } } else { - /* This device needs a driver */ - DPRINT1("A reboot is required for the new driver for '%wZ' to load\n", &DeviceInstance); + /* FIXME: What if the device really is disabled? */ + DeviceNode->Flags &= ~DNF_DISABLED; + + /* Load service data from the registry */ + Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); + + if (NT_SUCCESS(Status)) + { + /* Start the service and begin PnP initialization of the device again */ + Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); + DPRINT1("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); + } } ObDereferenceObject(DeviceObject);

1 0

[cgutman] 55826: [NTOSKRNL] - Fix device node flag corruption
by cgutman＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: cgutman Date: Thu Feb 23 00:41:50 2012 New Revision: 55826 URL: http://svn.reactos.org/svn/reactos?rev=55826&view=rev Log: [NTOSKRNL] - Fix device node flag corruption Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Thu Feb 23 00:41:50 2012 @@ -552,6 +552,9 @@ /* Get the device node */ DeviceNode = IopGetDeviceNode(DeviceObject); + ASSERT(DeviceNode->Flags & DNF_ENUMERATED); + ASSERT(DeviceNode->Flags & DNF_PROCESSED); + #if 0 /* Remove the device node */ Status = IopRemoveDevice(DeviceNode); @@ -563,9 +566,7 @@ } #else /* FIXME: We might clear some important flags */ - ASSERT(DeviceNode->Flags & DNF_ENUMERATED); - ASSERT(DeviceNode->Flags & DNF_PROCESSED); - DeviceNode->Flags = DNF_ENUMERATED | DNF_PROCESSED; + DeviceNode->Flags &= ~DNF_DISABLED; /* Load service data from the registry */ Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent);

1 0

[janderwald] 55825: [USBCCGP] - Print interface details when dumping the function descriptor - Fix bug USBCCG_AppendInterfaceNumber, which is not yet used
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 00:37:41 2012 New Revision: 55825 URL: http://svn.reactos.org/svn/reactos?rev=55825&view=rev Log: [USBCCGP] - Print interface details when dumping the function descriptor - Fix bug USBCCG_AppendInterfaceNumber, which is not yet used Modified: trunk/reactos/drivers/usb/usbccgp/misc.c trunk/reactos/drivers/usb/usbccgp/pdo.c Modified: trunk/reactos/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] Thu Feb 23 00:37:41 2012 @@ -215,10 +215,18 @@ for(SubIndex = 0; SubIndex < FunctionDescriptor[Index].NumberOfInterfaces; SubIndex++) { - DPRINT1(" Interface %p\n", FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]); - DPRINT1(" Interface InterfaceNumber %x\n", FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceNumber); - DPRINT1(" Interface Alternate %x\n", FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bAlternateSetting ); + DPRINT1(" Index %lu Interface %p\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]); + DPRINT1(" Index %lu Interface InterfaceNumber %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceNumber); + DPRINT1(" Index %lu Interface Alternate %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bAlternateSetting ); + DPRINT1(" Index %lu bLength %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bLength); + DPRINT1(" Index %lu bDescriptorType %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bDescriptorType); + DPRINT1(" Index %lu bInterfaceNumber %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceNumber); + DPRINT1(" Index %lu bAlternateSetting %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bAlternateSetting); + DPRINT1(" Index %lu bNumEndpoints %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bNumEndpoints); + DPRINT1(" Index %lu bInterfaceClass %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceClass); + DPRINT1(" Index %lu bInterfaceSubClass %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceSubClass); + DPRINT1(" Index %lu bInterfaceProtocol %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceProtocol); + DPRINT1(" Index %lu iInterface %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->iInterface); } } - } Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Thu Feb 23 00:37:41 2012 @@ -163,7 +163,7 @@ while(*DeviceId) { - StringLength = swprintf(String, L"%s&MI_%02x", DeviceId) + 1; + StringLength = swprintf(String, L"%s&MI_%02x", DeviceId, InterfaceNumber) + 1; Length = wcslen(DeviceId) + 1; DPRINT("String %p\n", String);

1 0

[janderwald] 55824: [HIDPARSE] - Fix several wrong translated scan codes
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 00:35:46 2012 New Revision: 55824 URL: http://svn.reactos.org/svn/reactos?rev=55824&view=rev Log: [HIDPARSE] - Fix several wrong translated scan codes Modified: trunk/reactos/lib/drivers/hidparser/api.c Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Thu Feb 23 00:35:46 2012 @@ -27,10 +27,11 @@ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x001d, 0x002a, 0x0038, 0x007d, 0x0061, 0x0036, 0x0064, 0x007e, 0x00a4, 0x00a6, 0x00a5, 0x00a3, 0x00a1, 0x0073, 0x0072, 0x0071, + 0x001D, 0x002A, 0x0038, 0xE05B, 0xE01D, 0x0036, 0xE038, 0xE05C, 0x00a4, 0x00a6, 0x00a5, 0x00a3, 0x00a1, 0x0073, 0x0072, 0x0071, 0x0096, 0x009e, 0x009f, 0x0080, 0x0088, 0x00b1, 0x00b2, 0x00b0, 0x008e, 0x0098, 0x00ad, 0x008c, 0x0000, 0x0000, 0x0000, 0x0000, }; +//#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) HIDPARSER_STATUS HidParser_GetCollectionUsagePage( @@ -736,6 +737,16 @@ return HIDPARSER_STATUS_I8042_TRANS_UNKNOWN; } +#if 0 + if ((ScanCode & 0xE000) == 0xE000) + { + // + // swap scan code + // + ScanCode = NTOHS(ScanCode); + } +#endif + // // FIXME: translate modifier states //

1 0

[janderwald] 55823: [HIDCLASS] - Silence traces - Signal event when last pending transfer is done - Reject new transfers when stop is in progress
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 00:34:36 2012 New Revision: 55823 URL: http://svn.reactos.org/svn/reactos?rev=55823&view=rev Log: [HIDCLASS] - Silence traces - Signal event when last pending transfer is done - Reject new transfers when stop is in progress Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Thu Feb 23 00:34:36 2012 @@ -402,13 +402,13 @@ // IrpContext = (PHIDCLASS_IRP_CONTEXT)Ctx; - DPRINT1("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); - DPRINT1("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); - DPRINT1("HidClass_ReadCompleteIrp Length %lu\n", Irp->IoStatus.Information); - DPRINT1("HidClass_ReadCompleteIrp Irp %p\n", Irp); - DPRINT1("HidClass_ReadCompleteIrp InputReportBuffer %p\n", IrpContext->InputReportBuffer); - DPRINT1("HidClass_ReadCompleteIrp InputReportBufferLength %li\n", IrpContext->InputReportBufferLength); - DPRINT1("HidClass_ReadCompleteIrp OriginalIrp %p\n", IrpContext->OriginalIrp); + DPRINT("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); + DPRINT("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); + DPRINT("HidClass_ReadCompleteIrp Length %lu\n", Irp->IoStatus.Information); + DPRINT("HidClass_ReadCompleteIrp Irp %p\n", Irp); + DPRINT("HidClass_ReadCompleteIrp InputReportBuffer %p\n", IrpContext->InputReportBuffer); + DPRINT("HidClass_ReadCompleteIrp InputReportBufferLength %li\n", IrpContext->InputReportBufferLength); + DPRINT("HidClass_ReadCompleteIrp OriginalIrp %p\n", IrpContext->OriginalIrp); // // copy result @@ -506,6 +506,15 @@ KeSetEvent(&IrpContext->FileOp->IrpReadComplete, 0, FALSE); } + if (IrpContext->FileOp->StopInProgress && IsEmpty) + { + // + // last pending irp + // + DPRINT1("[HIDCLASS] LastPendingTransfer Signalling\n"); + KeSetEvent(&IrpContext->FileOp->IrpReadComplete, 0, FALSE); + } + // // free irp context // @@ -642,6 +651,19 @@ // sanity check // ASSERT(CollectionDescription->InputLength >= ReportDescription->InputLength); + + if (Context->StopInProgress) + { + // + // stop in progress + // + DPRINT1("[HIDCLASS] Stop In Progress\n"); + Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_CANCELLED; + + } + // // store report length

1 0

[akhaldi] 55822: * Sync with trunk r55820.
by akhaldi＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: akhaldi Date: Wed Feb 22 23:53:35 2012 New Revision: 55822 URL: http://svn.reactos.org/svn/reactos?rev=55822&view=rev Log: * Sync with trunk r55820. Modified: branches/arty-newcc/ (props changed) branches/arty-newcc/base/system/smss2/pagefile.c branches/arty-newcc/base/system/smss2/sminit.c branches/arty-newcc/base/system/smss2/smsubsys.c branches/arty-newcc/dll/win32/kernel32/client/file/cnotify.c branches/arty-newcc/dll/win32/kernel32/include/kernel32.h branches/arty-newcc/dll/win32/kernel32/wine/actctx.c branches/arty-newcc/drivers/usb/CMakeLists.txt branches/arty-newcc/drivers/usb/usbccgp/descriptor.c branches/arty-newcc/drivers/usb/usbccgp/function.c branches/arty-newcc/drivers/usb/usbccgp/usbccgp.h branches/arty-newcc/drivers/usb/usbehci/ (props changed) branches/arty-newcc/drivers/usb/usbehci/usb_device.cpp branches/arty-newcc/drivers/usb/usbohci/ (props changed) branches/arty-newcc/drivers/usb/usbohci/usb_device.cpp branches/arty-newcc/drivers/usb/usbuhci/hardware.cpp branches/arty-newcc/drivers/usb/usbuhci/hardware.h branches/arty-newcc/drivers/usb/usbuhci/interfaces.h branches/arty-newcc/drivers/usb/usbuhci/usb_device.cpp branches/arty-newcc/drivers/usb/usbuhci/usb_queue.cpp branches/arty-newcc/drivers/usb/usbuhci/usb_request.cpp branches/arty-newcc/include/ddk/csq.h branches/arty-newcc/include/ddk/ndis.h branches/arty-newcc/include/psdk/access.idl branches/arty-newcc/include/psdk/usbioctl.h branches/arty-newcc/include/psdk/winddi.h branches/arty-newcc/include/psdk/winefs.h branches/arty-newcc/include/reactos/wine/debug.h branches/arty-newcc/include/reactos/wine/test.h branches/arty-newcc/lib/rtl/path.c branches/arty-newcc/media/inf/cdrom.inf branches/arty-newcc/media/inf/msmouse.inf branches/arty-newcc/media/inf/usb.inf branches/arty-newcc/media/inf/usbport.inf branches/arty-newcc/ntoskrnl/io/iomgr/deviface.c branches/arty-newcc/ntoskrnl/io/iomgr/volume.c branches/arty-newcc/ntoskrnl/io/pnpmgr/plugplay.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpmgr.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/i386/page.c branches/arty-newcc/ntoskrnl/mm/mminit.c branches/arty-newcc/ntoskrnl/ps/query.c branches/arty-newcc/tools/cabman/CMakeLists.txt branches/arty-newcc/tools/cabman/main.cxx [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/smss2/pa… Modified: branches/arty-newcc/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/smss2/sm… Modified: branches/arty-newcc/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/smss2/sm… Modified: branches/arty-newcc/dll/win32/kernel32/client/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… Modified: branches/arty-newcc/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/i… Modified: branches/arty-newcc/dll/win32/kernel32/wine/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/w… Modified: branches/arty-newcc/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/CMakeLis… Modified: branches/arty-newcc/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbccgp/… Modified: branches/arty-newcc/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbccgp/… Modified: branches/arty-newcc/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbccgp/… Modified: branches/arty-newcc/drivers/usb/usbehci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbehci/… Modified: branches/arty-newcc/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbohci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/usb/usbuhci/… Modified: branches/arty-newcc/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/csq.h?re… Modified: branches/arty-newcc/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/ndis.h?r… Modified: branches/arty-newcc/include/psdk/access.idl URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/access.… Modified: branches/arty-newcc/include/psdk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/usbioct… Modified: branches/arty-newcc/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/winddi.… Modified: branches/arty-newcc/include/psdk/winefs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/winefs.… Modified: branches/arty-newcc/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/wine… Modified: branches/arty-newcc/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/wine… Modified: branches/arty-newcc/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/path.c?rev=5… Modified: branches/arty-newcc/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/cdrom.inf?… Modified: branches/arty-newcc/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/msmouse.in… Modified: branches/arty-newcc/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/usb.inf?re… Modified: branches/arty-newcc/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/media/inf/usbport.in… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/de… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/vo… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… Modified: branches/arty-newcc/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/i386/pag… Modified: branches/arty-newcc/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mminit.c… Modified: branches/arty-newcc/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/query.c?… Modified: branches/arty-newcc/tools/cabman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/cabman/CMakeLi… Modified: branches/arty-newcc/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/cabman/main.cx…

1 0

[cgutman] 55821: [USBUHCI] - Add rbuild file and enable build
by cgutman＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: cgutman Date: Wed Feb 22 23:35:11 2012 New Revision: 55821 URL: http://svn.reactos.org/svn/reactos?rev=55821&view=rev Log: [USBUHCI] - Add rbuild file and enable build Added: trunk/reactos/drivers/usb/usbuhci/usbuhci.rbuild (with props) Modified: trunk/reactos/drivers/usb/directory.rbuild Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… ============================================================================== --- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Wed Feb 22 23:35:11 2012 @@ -19,4 +19,7 @@ <directory name="usbstor"> <xi:include href="usbstor/usbstor.rbuild" /> </directory> + <directory name="usbuhci"> + <xi:include href="usbuhci/usbuhci.rbuild" /> + </directory> </group> Added: trunk/reactos/drivers/usb/usbuhci/usbuhci.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.rbuild (added) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.rbuild [iso-8859-1] Wed Feb 22 23:35:11 2012 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <redefine name="_WIN32_WINNT">0x600</redefine> + <library>ntoskrnl</library> + <library>hal</library> + <library>usbd</library> + <library>pseh</library> + <file>usbuhci.cpp</file> + <file>usb_device.cpp</file> + <file>usb_request.cpp</file> + <file>usb_queue.cpp</file> + <file>hcd_controller.cpp</file> + <file>hardware.cpp</file> + <file>misc.cpp</file> + <file>purecall.cpp</file> + <file>hub_controller.cpp</file> + <file>memory_manager.cpp</file> + <file>usbuhci.rc</file> + <compilerflag>-fno-rtti</compilerflag> + <compilerflag>-fno-exceptions</compilerflag> +</module> Propchange: trunk/reactos/drivers/usb/usbuhci/usbuhci.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 55820: [USBUHCI] - Silence traces - Implement abort pipe - Implement support for interrupt transfers
by janderwald＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: janderwald Date: Wed Feb 22 23:24:53 2012 New Revision: 55820 URL: http://svn.reactos.org/svn/reactos?rev=55820&view=rev Log: [USBUHCI] - Silence traces - Implement abort pipe - Implement support for interrupt transfers Modified: trunk/reactos/drivers/usb/usbuhci/usb_device.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/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] Wed Feb 22 23:24:53 2012 @@ -1053,36 +1053,36 @@ VOID CUSBDevice::DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) { - DPRINT1("Dumping Device Descriptor %x\n", DeviceDescriptor); - DPRINT1("bLength %x\n", DeviceDescriptor->bLength); - DPRINT1("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType); - DPRINT1("bcdUSB %x\n", DeviceDescriptor->bcdUSB); - DPRINT1("bDeviceClass %x\n", DeviceDescriptor->bDeviceClass); - DPRINT1("bDeviceSubClass %x\n", DeviceDescriptor->bDeviceSubClass); - DPRINT1("bDeviceProtocol %x\n", DeviceDescriptor->bDeviceProtocol); - DPRINT1("bMaxPacketSize0 %x\n", DeviceDescriptor->bMaxPacketSize0); - DPRINT1("idVendor %x\n", DeviceDescriptor->idVendor); - DPRINT1("idProduct %x\n", DeviceDescriptor->idProduct); - DPRINT1("bcdDevice %x\n", DeviceDescriptor->bcdDevice); - DPRINT1("iManufacturer %x\n", DeviceDescriptor->iManufacturer); - DPRINT1("iProduct %x\n", DeviceDescriptor->iProduct); - DPRINT1("iSerialNumber %x\n", DeviceDescriptor->iSerialNumber); - DPRINT1("bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); + DPRINT("Dumping Device Descriptor %x\n", DeviceDescriptor); + DPRINT("bLength %x\n", DeviceDescriptor->bLength); + DPRINT("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType); + DPRINT("bcdUSB %x\n", DeviceDescriptor->bcdUSB); + DPRINT("bDeviceClass %x\n", DeviceDescriptor->bDeviceClass); + DPRINT("bDeviceSubClass %x\n", DeviceDescriptor->bDeviceSubClass); + DPRINT("bDeviceProtocol %x\n", DeviceDescriptor->bDeviceProtocol); + DPRINT("bMaxPacketSize0 %x\n", DeviceDescriptor->bMaxPacketSize0); + DPRINT("idVendor %x\n", DeviceDescriptor->idVendor); + DPRINT("idProduct %x\n", DeviceDescriptor->idProduct); + DPRINT("bcdDevice %x\n", DeviceDescriptor->bcdDevice); + DPRINT("iManufacturer %x\n", DeviceDescriptor->iManufacturer); + DPRINT("iProduct %x\n", DeviceDescriptor->iProduct); + DPRINT("iSerialNumber %x\n", DeviceDescriptor->iSerialNumber); + DPRINT("bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); } //---------------------------------------------------------------------------------------- VOID CUSBDevice::DumpConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) { - DPRINT1("Dumping ConfigurationDescriptor %x\n", ConfigurationDescriptor); - DPRINT1("bLength %x\n", ConfigurationDescriptor->bLength); - DPRINT1("bDescriptorType %x\n", ConfigurationDescriptor->bDescriptorType); - DPRINT1("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength); - DPRINT1("bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); - DPRINT1("bConfigurationValue %x\n", ConfigurationDescriptor->bConfigurationValue); - DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); - DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); - DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); + DPRINT("Dumping ConfigurationDescriptor %x\n", ConfigurationDescriptor); + DPRINT("bLength %x\n", ConfigurationDescriptor->bLength); + DPRINT("bDescriptorType %x\n", ConfigurationDescriptor->bDescriptorType); + DPRINT("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength); + DPRINT("bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); + DPRINT("bConfigurationValue %x\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); + DPRINT("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); + DPRINT("MaxPower %x\n", ConfigurationDescriptor->MaxPower); } //---------------------------------------------------------------------------------------- NTSTATUS 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 22 23:24:53 2012 @@ -220,8 +220,8 @@ // // add queue head // - DPRINT1("AddUSBRequest Request %p\n", Request); - DPRINT1("NewQueueHead %p\n", NewQueueHead); + DPRINT("AddUSBRequest Request %p\n", Request); + DPRINT("NewQueueHead %p\n", NewQueueHead); return AddQueueHead(NewQueueHead); } @@ -260,9 +260,49 @@ IN UCHAR DeviceAddress, IN struct _USB_ENDPOINT *EndpointDescriptor) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + KIRQL OldLevel; + PUHCI_TRANSFER_DESCRIPTOR Descriptor; + PUHCI_QUEUE_HEAD QueueHead, PreviousQueueHead = NULL; + UCHAR EndpointAddress, EndpointDeviceAddress; + + + // acquire lock + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // get queue head + m_Hardware->GetQueueHead(UHCI_INTERRUPT_QUEUE, &QueueHead); + + while(QueueHead) + { + // get descriptor + Descriptor = (PUHCI_TRANSFER_DESCRIPTOR)QueueHead->NextElementDescriptor; + + if (Descriptor) + { + // extract endpoint address + EndpointAddress = (Descriptor->Token >> TD_TOKEN_ENDPTADDR_SHIFT) & 0x0F; + + // extract device address + EndpointDeviceAddress = (Descriptor->Token >> TD_TOKEN_DEVADDR_SHIFT) & 0x7F; + + // check if they match + if (EndpointAddress == (EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0x0F) && + DeviceAddress == EndpointDeviceAddress) + { + // cleanup queue head + QueueHeadCleanup(QueueHead, PreviousQueueHead, &QueueHead); + continue; + } + } + + // move to next queue head + PreviousQueueHead = QueueHead; + QueueHead = (PUHCI_QUEUE_HEAD)QueueHead->NextLogicalDescriptor; + } + + // release lock + KeReleaseSpinLock(&m_Lock, OldLevel); + return STATUS_SUCCESS; } NTSTATUS @@ -295,7 +335,7 @@ // // empty queue head // - DPRINT1("QueueHead %p empty element physical\n", QueueHead); + DPRINT("QueueHead %p empty element physical\n", QueueHead); return FALSE; } @@ -396,7 +436,7 @@ // // free queue head // - DPRINT1("Request %p\n", Request); + DPRINT("Request %p\n", Request); Request->FreeEndpointDescriptor(QueueHead); // @@ -467,7 +507,7 @@ // // is queue head complete // - DPRINT1("QueueHead %p\n", QueueHead); + DPRINT("QueueHead %p\n", QueueHead); IsComplete = IsQueueHeadComplete(QueueHead); if (IsComplete) { 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 22 23:24:53 2012 @@ -59,6 +59,7 @@ USHORT GetMaxPacketSize(); NTSTATUS CreateDescriptor(PUHCI_TRANSFER_DESCRIPTOR *OutDescriptor, IN UCHAR PidCode, ULONG BufferLength); NTSTATUS BuildControlTransferDescriptor(IN PUHCI_QUEUE_HEAD * OutQueueHead); + NTSTATUS BuildBulkInterruptTransferDescriptor(IN PUHCI_QUEUE_HEAD * OutQueueHead); NTSTATUS BuildQueueHead(OUT PUHCI_QUEUE_HEAD *OutQueueHead); VOID FreeDescriptor(IN PUHCI_TRANSFER_DESCRIPTOR Descriptor); NTSTATUS BuildTransferDescriptorChain(IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode, IN UCHAR InitialDataToggle, OUT PUHCI_TRANSFER_DESCRIPTOR * OutFirstDescriptor, OUT PUHCI_TRANSFER_DESCRIPTOR * OutLastDescriptor, OUT PULONG OutTransferBufferOffset, OUT PUCHAR OutDataToggle); @@ -138,6 +139,9 @@ // store device speed // USB_DEVICE_SPEED m_DeviceSpeed; + + // base + PVOID m_Base; }; @@ -607,13 +611,24 @@ struct _UHCI_QUEUE_HEAD ** OutQueueHead) { NTSTATUS Status = STATUS_UNSUCCESSFUL; - - if (InternalGetTransferType() == USB_ENDPOINT_TYPE_CONTROL) + ULONG TransferType; + + // get transfer type + TransferType = InternalGetTransferType(); + + if (TransferType == USB_ENDPOINT_TYPE_CONTROL) { // // build queue head // Status = BuildControlTransferDescriptor(OutQueueHead); + } + else if (TransferType == USB_ENDPOINT_TYPE_INTERRUPT || TransferType == USB_ENDPOINT_TYPE_BULK) + { + // + // build queue head + // + Status = BuildBulkInterruptTransferDescriptor(OutQueueHead); } if (!NT_SUCCESS(Status)) @@ -783,7 +798,7 @@ // store address & endpoint number // Descriptor->Token |= GetEndpointAddress() << TD_TOKEN_ENDPTADDR_SHIFT; - Descriptor->Token |= GetDeviceAddress() << 8 | PidCode; + Descriptor->Token |= GetDeviceAddress() << TD_TOKEN_DEVADDR_SHIFT | PidCode; if (BufferLength) { @@ -990,6 +1005,70 @@ // m_DmaManager->Release(Descriptor, sizeof(UHCI_TRANSFER_DESCRIPTOR)); } + +NTSTATUS +CUSBRequest::BuildBulkInterruptTransferDescriptor( + IN PUHCI_QUEUE_HEAD * OutQueueHead) +{ + NTSTATUS Status; + PUHCI_QUEUE_HEAD QueueHead; + PUHCI_TRANSFER_DESCRIPTOR FirstDescriptor, LastDescriptor; + ULONG ChainDescriptorLength; + BOOLEAN Direction; + PVOID Buffer; + ULONG BufferSize; + + // create queue head + Status = BuildQueueHead(&QueueHead); + if (!NT_SUCCESS(Status)) + { + // failed to allocate descriptor + DPRINT1("[UHCI] Failed to create queue head\n"); + return Status; + } + + // get direction + Direction = InternalGetPidDirection(); + + if (!m_Base) + { + // get buffer base + m_Base = MmGetMdlVirtualAddress(m_TransferBufferMDL); + } + + // get new buffer offset + Buffer = (PVOID)((ULONG_PTR)m_Base + m_TransferBufferLengthCompleted); + + // FIXME determine buffer limit + BufferSize = min(m_TransferBufferLength - m_TransferBufferLengthCompleted, PAGE_SIZE); + + // create descriptor chain + Status = BuildTransferDescriptorChain(Buffer, + BufferSize, + Direction ? TD_TOKEN_IN : TD_TOKEN_OUT, + m_EndpointDescriptor->DataToggle, + &FirstDescriptor, + &LastDescriptor, + &ChainDescriptorLength, + NULL); + + // adjust buffer offset + m_TransferBufferLengthCompleted += ChainDescriptorLength; + + // fire interrupt when the last descriptor is complete + LastDescriptor->Status |= TD_CONTROL_IOC; + LastDescriptor->LinkPhysical = TD_TERMINATE; + LastDescriptor->NextLogicalDescriptor = NULL; + + // link queue head with first data descriptor descriptor + QueueHead->NextElementDescriptor = (PVOID)FirstDescriptor; + QueueHead->ElementPhysical = FirstDescriptor->PhysicalAddress; + + // store result + *OutQueueHead = QueueHead; + return STATUS_SUCCESS; +} + NTSTATUS CUSBRequest::BuildControlTransferDescriptor( 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 22 23:24:53 2012 @@ -2,7 +2,7 @@ #define USBOHCI_H__ #include <ntddk.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <hubbusif.h> #include <usbbusif.h>

1 0

[cgutman] 55819: [NTOSKRNL] - Add back the reset hack of doom to circumvent broken removal code in just about every driver
by cgutman＠svn.reactos.org 22 Feb '12

22 Feb '12

Author: cgutman Date: Wed Feb 22 23:08:52 2012 New Revision: 55819 URL: http://svn.reactos.org/svn/reactos?rev=55819&view=rev Log: [NTOSKRNL] - Add back the reset hack of doom to circumvent broken removal code in just about every driver Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Wed Feb 22 23:08:52 2012 @@ -552,38 +552,40 @@ /* Get the device node */ DeviceNode = IopGetDeviceNode(DeviceObject); - /* Check if an FDO has been added to the stack */ - if (DeviceNode->Flags & DNF_ADDED) - { - /* Remove the device node */ - Status = IopRemoveDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("WARNING: Ignoring failed IopRemoveDevice() for %wZ (likely a driver bug)\n", &DeviceNode->InstancePath); - } - +#if 0 + /* Remove the device node */ + Status = IopRemoveDevice(DeviceNode); + if (NT_SUCCESS(Status)) + { /* Invalidate device relations for the parent to reenumerate the device */ Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); - - DPRINT1("Reset PDO with FDO present: 0x%x\n", Status); + DPRINT1("A new driver has been loaded for '%wZ'\n", &DeviceInstance); + } +#else + /* FIXME: We might clear some important flags */ + ASSERT(DeviceNode->Flags & DNF_ENUMERATED); + ASSERT(DeviceNode->Flags & DNF_PROCESSED); + DeviceNode->Flags = DNF_ENUMERATED | DNF_PROCESSED; + + /* Load service data from the registry */ + Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); + + if (NT_SUCCESS(Status)) + { + /* Start the service and begin PnP initialization of the device again */ + Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); + DPRINT1("HACK: A new driver has been loaded for '%wZ' WITHOUT removing the old one\n", &DeviceInstance); + } +#endif + else if (DeviceNode->Flags & DNF_ADDED) + { + /* A driver has already been loaded for this device */ + DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceInstance); } else { - /* FIXME: We might clear some important flags */ - ASSERT(DeviceNode->Flags & DNF_ENUMERATED); - ASSERT(DeviceNode->Flags & DNF_PROCESSED); - DeviceNode->Flags = DNF_ENUMERATED | DNF_PROCESSED; - - /* Load service data from the registry */ - Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); - - if (NT_SUCCESS(Status)) - { - /* Start the service and begin PnP initialization of the device again */ - Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); - } - - DPRINT1("Reset PDO with no FDO present: 0x%x\n", Status); + /* This device needs a driver */ + DPRINT1("A reboot is required for the new driver for '%wZ' to load\n", &DeviceInstance); } ObDereferenceObject(DeviceObject);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
58
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 February 2012