Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[janderwald] 55395: [USBOHCI] - Fix mingw build
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 15:55:04 2012 New Revision: 55395 URL: http://svn.reactos.org/svn/reactos?rev=55395&view=rev Log: [USBOHCI] - Fix mingw build Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 15:55:04 2012 @@ -1700,9 +1700,7 @@ IN OUT PIRP Irp, IN OUT PURB Urb) { - USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status = STATUS_SUCCESS; - PUSBDEVICE UsbDevice; PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; ULONG Type; @@ -1759,11 +1757,9 @@ IN OUT PIRP Irp, IN OUT PURB Urb) { - USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; PUSBDEVICE UsbDevice; PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; - // // sanity check

1 0

[janderwald] 55394: [USBOHCI] - Implement reseting pipe and clear pipe stall
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 14:47:18 2012 New Revision: 55394 URL: http://svn.reactos.org/svn/reactos?rev=55394&view=rev Log: [USBOHCI] - Implement reseting pipe and clear pipe stall Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -229,6 +229,7 @@ #define OHCI_ENDPOINT_SKIP 0x00004000 #define OHCI_ENDPOINT_SET_DEVICE_ADDRESS(s) (s) +#define OHCI_ENDPOINT_GET_DEVICE_ADDRESS(s) ((s) & 0xFF) #define OHCI_ENDPOINT_GET_ENDPOINT_NUMBER(s) (((s) >> 7) & 0xf) #define OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(s) ((s) << 7) #define OHCI_ENDPOINT_GET_MAX_PACKET_SIZE(s) (((s) >> 16) & 0x07ff) Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -70,6 +70,9 @@ NTSTATUS HandleClassEndpoint(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleIsochronousTransfer(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClearStall(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleSyncResetAndClearStall(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleAbortPipe(IN OUT PIRP Irp, PURB Urb); friend VOID StatusChangeEndpointCallBack(PVOID Context); @@ -1692,6 +1695,187 @@ return Status; } +NTSTATUS +CHubController::HandleSyncResetAndClearStall( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status = STATUS_SUCCESS; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + ULONG Type; + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + + // + // get type + // + Type = (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); + if (Type != USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + // + // clear stall + // + Status = HandleClearStall(Irp, Urb); + } + DPRINT1("URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", Status); + + // + // FIXME reset data toggle + // + + // + // done + // + return Status; +} + +NTSTATUS +CHubController::HandleAbortPipe( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // issue request + // + Status = UsbDevice->AbortPipe(EndpointDescriptor); + DPRINT1("URB_FUNCTION_ABORT_PIPE Status %x\n", Status); + + // + // done + // + return Status; +} + + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleClearStall( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleClearStall invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("URB_FUNCTION_SYNC_CLEAR_STALL\n"); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0x02; + CtrlSetup.bRequest = USB_REQUEST_CLEAR_FEATURE; + CtrlSetup.wValue.W = USB_FEATURE_ENDPOINT_STALL; + CtrlSetup.wIndex.W = EndpointDescriptor->bEndpointAddress; + CtrlSetup.wLength = 0; + CtrlSetup.wValue.W = 0; + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, 0, 0); + + DPRINT1("URB_FUNCTION_CLEAR_STALL Status %x\n", Status); + + // + // done + // + return Status; +} + + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleClassInterface( @@ -1813,6 +1997,16 @@ switch (Urb->UrbHeader.Function) { + case URB_FUNCTION_SYNC_RESET_PIPE: + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + Status = HandleSyncResetAndClearStall(Irp, Urb); + break; + case URB_FUNCTION_ABORT_PIPE: + Status = HandleAbortPipe(Irp, Urb); + break; + case URB_FUNCTION_SYNC_CLEAR_STALL: + Status = HandleClearStall(Irp, Urb); + break; case URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE: Status = HandleGetDescriptorFromInterface(Irp, Urb); break; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -556,6 +556,14 @@ virtual VOID TransferDescriptorCompletionCallback(ULONG TransferDescriptorLogicalAddress) = 0; + +//----------------------------------------------------------------------------------------- +// +// AbortDevicePipe +// +// Description: aborts all pending requsts of an device + + virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0; }; typedef IUSBQueue *PUSBQUEUE; @@ -809,6 +817,16 @@ virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface) = 0; + + +//----------------------------------------------------------------------------------------- +// +// AbortPipe +// +// Description: aborts all pending requsts + + virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0; + }; typedef IUSBDevice *PUSBDEVICE; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -52,6 +52,7 @@ virtual NTSTATUS SubmitSetupPacket(IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, OUT ULONG BufferLength, OUT PVOID Buffer); virtual NTSTATUS SelectConfiguration(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, IN PUSBD_INTERFACE_INFORMATION Interface, OUT USBD_CONFIGURATION_HANDLE *ConfigurationHandle); virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface); + virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor); // local function virtual NTSTATUS CommitIrp(PIRP Irp); @@ -1174,6 +1175,22 @@ return Status; } +NTSTATUS +CUSBDevice::AbortPipe( + IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) +{ + // + // let it handle usb queue + // + ASSERT(m_Queue); + ASSERT(m_DeviceAddress); + + // + // done + // + return m_Queue->AbortDevicePipe(m_DeviceAddress, EndpointDescriptor); +} + //---------------------------------------------------------------------------------------- NTSTATUS CreateUSBDevice( Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -40,6 +40,7 @@ virtual NTSTATUS CancelRequests(); virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); virtual VOID TransferDescriptorCompletionCallback(ULONG TransferDescriptorLogicalAddress); + virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor); // local functions BOOLEAN IsTransferDescriptorInEndpoint(IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG TransferDescriptorLogicalAddress); @@ -741,6 +742,115 @@ } NTSTATUS +CUSBQueue::AbortDevicePipe( + IN UCHAR DeviceAddress, + IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) +{ + POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor, CurrentDescriptor, PreviousDescriptor, TempDescriptor; + ULONG Type; + POHCI_GENERAL_TD TransferDescriptor; + + // + // get type + // + Type = (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); + + // + // check type + // + if (Type == USB_ENDPOINT_TYPE_BULK) + { + // + // get head descriptor + // + HeadDescriptor = m_BulkHeadEndpointDescriptor; + } + else if (Type == USB_ENDPOINT_TYPE_CONTROL) + { + // + // get head descriptor + // + HeadDescriptor = m_ControlHeadEndpointDescriptor; + } + else if (Type == USB_ENDPOINT_TYPE_INTERRUPT) + { + // + // get head descriptor + // + HeadDescriptor = FindInterruptEndpointDescriptor(EndpointDescriptor->bInterval); + ASSERT(HeadDescriptor); + } + else if (Type == USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; + } + + // + // FIXME should disable list processing + // + + // + // now remove all endpoints + // + ASSERT(HeadDescriptor); + CurrentDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)HeadDescriptor->NextDescriptor; + PreviousDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)HeadDescriptor; + + while(CurrentDescriptor) + { + if ((CurrentDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_HEAD_MASK) == CurrentDescriptor->TailPhysicalDescriptor || (CurrentDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_HALTED)) + { + // + // cleanup endpoint + // + TempDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CurrentDescriptor->NextDescriptor; + CleanupEndpointDescriptor(CurrentDescriptor, PreviousDescriptor); + + // + // use next descriptor + // + CurrentDescriptor = TempDescriptor; + } + + if (!CurrentDescriptor) + break; + + if (CurrentDescriptor->HeadPhysicalDescriptor) + { + TransferDescriptor = (POHCI_GENERAL_TD)CurrentDescriptor->HeadLogicalDescriptor; + ASSERT(TransferDescriptor); + + if ((OHCI_ENDPOINT_GET_ENDPOINT_NUMBER(TransferDescriptor->Flags) == (EndpointDescriptor->bEndpointAddress & 0xF)) && + (OHCI_ENDPOINT_GET_DEVICE_ADDRESS(TransferDescriptor->Flags) == DeviceAddress)) + { + // + // cleanup endpoint + // + TempDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CurrentDescriptor->NextDescriptor; + CleanupEndpointDescriptor(CurrentDescriptor, PreviousDescriptor); + // + // use next descriptor + // + CurrentDescriptor = TempDescriptor; + } + } + + if (!CurrentDescriptor) + break; + + PreviousDescriptor = CurrentDescriptor; + CurrentDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CurrentDescriptor->NextDescriptor; + } + + // + // done + // + return STATUS_SUCCESS; +} + + +NTSTATUS CreateUSBQueue( PUSBQUEUE *OutUsbQueue) { Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -7,6 +7,7 @@ #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h> +#include <usb100.h> extern "C"

1 0

[janderwald] 55393: [USBOHCI] - Fix build
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 13:02:45 2012 New Revision: 55393 URL: http://svn.reactos.org/svn/reactos?rev=55393&view=rev Log: [USBOHCI] - Fix build Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 13:02:45 2012 @@ -2282,7 +2282,7 @@ CHubController * Controller; NTSTATUS Status; - DPRINT1("USBHI_CreateUsbDevice\n"); + DPRINT1("USBHI_CreateUsbDevice PortStatus %x\n", PortStatus); // // first get hub controller Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Feb 3 13:02:45 2012 @@ -80,6 +80,8 @@ PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; PUSB_CONFIGURATION_DESCRIPTOR *m_ConfigurationDescriptors; + LIST_ENTRY m_IrpListHead; + }; //---------------------------------------------------------------------------------------- @@ -118,6 +120,11 @@ KeInitializeSpinLock(&m_Lock); // + // initialize irp list + // + InitializeListHead(&m_IrpListHead); + + // // no device address has been set yet // m_DeviceAddress = 0; @@ -268,7 +275,6 @@ DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); PC_ASSERT(FALSE); - return Usb11Device; } @@ -462,7 +468,7 @@ // // initialize request // - Status = Request->InitializeWithIrp(m_DmaManager, Irp); + Status = Request->InitializeWithIrp(m_DmaManager, Irp, GetSpeed()); // // mark irp as pending @@ -550,7 +556,7 @@ // // initialize request // - Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, EndpointDescriptor, BufferLength, Mdl); + Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, EndpointDescriptor, GetSpeed(), BufferLength, Mdl); if (!NT_SUCCESS(Status)) { //

1 0

[janderwald] 55392: [USBOHCI] - Don't hardcode the device speed
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 11:29:03 2012 New Revision: 55392 URL: http://svn.reactos.org/svn/reactos?rev=55392&view=rev Log: [USBOHCI] - Don't hardcode the device speed Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Fri Feb 3 11:29:03 2012 @@ -19,7 +19,8 @@ CreateUsbChildDeviceObject( IN PDEVICE_OBJECT UsbHubDeviceObject, IN LONG PortId, - OUT PDEVICE_OBJECT *UsbChildDeviceObject); + OUT PDEVICE_OBJECT *UsbChildDeviceObject, + IN ULONG PortStatus); NTSTATUS DestroyUsbChildDeviceObject( @@ -402,7 +403,7 @@ // // This is a new device // - Status = CreateUsbChildDeviceObject(DeviceObject, PortId, NULL); + Status = CreateUsbChildDeviceObject(DeviceObject, PortId, NULL, PortStatus.Status); } } @@ -1149,7 +1150,8 @@ CreateUsbChildDeviceObject( IN PDEVICE_OBJECT UsbHubDeviceObject, IN LONG PortId, - OUT PDEVICE_OBJECT *UsbChildDeviceObject) + OUT PDEVICE_OBJECT *UsbChildDeviceObject, + IN ULONG PortStatus) { NTSTATUS Status; PDEVICE_OBJECT RootHubDeviceObject, NewChildDeviceObject; @@ -1252,7 +1254,7 @@ Status = HubInterface->CreateUsbDevice(HubInterfaceBusContext, (PVOID)&UsbChildExtension->UsbDeviceHandle, HubDeviceExtension->RootHubHandle, - 0x501, //hack + PortStatus, PortId); if (!NT_SUCCESS(Status)) {

1 0

[tfaber] 55391: [SMSS2] - Properly handle an empty list in SmpSaveRegistryValue - Compare the value string for equality, as the comment says, not inequality - This fixes a crash, although another s...
by tfaber＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: tfaber Date: Fri Feb 3 11:21:15 2012 New Revision: 55391 URL: http://svn.reactos.org/svn/reactos?rev=55391&view=rev Log: [SMSS2] - Properly handle an empty list in SmpSaveRegistryValue - Compare the value string for equality, as the comment says, not inequality - This fixes a crash, although another solution may perhaps be better Modified: trunk/reactos/base/system/smss2/sminit.c Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Fri Feb 3 11:21:15 2012 @@ -72,7 +72,10 @@ RtlInitUnicodeString(&NameString, Name); RtlInitUnicodeString(&ValueString, Value); - /* Check if we should do a duplicat echeck */ + /* In case this is the first value, initialize a new list/structure */ + RegEntry = NULL; + + /* Check if we should do a duplicate check */ if (Flags) { /* Loop the current list */ @@ -86,9 +89,7 @@ if (!RtlCompareUnicodeString(&RegEntry->Name, &NameString, TRUE)) { /* Check if the value is the exact same thing */ - if (((Value) && - (RtlCompareUnicodeString(&RegEntry->Value, &ValueString, TRUE))) || - (!(Value) && !(RegEntry->Value.Buffer))) + if (!RtlCompareUnicodeString(&RegEntry->Value, &ValueString, TRUE)) { /* Fail -- the same setting is being set twice */ return STATUS_OBJECT_NAME_EXISTS; @@ -102,11 +103,6 @@ NextEntry = NextEntry->Flink; RegEntry = NULL; } - } - else - { - /* This should be the first value, so initialize a new list/structure */ - RegEntry = NULL; } /* Are we adding on, or creating a new entry */ @@ -140,6 +136,7 @@ if (RegEntry->Value.Buffer) { /* Free it */ + ASSERT(RegEntry->Value.Length != 0); RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer); }

1 0

[janderwald] 55390: [USBOHCI] - Consider device speed when building the device endpoint descriptor
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 11:02:37 2012 New Revision: 55390 URL: http://svn.reactos.org/svn/reactos?rev=55390&view=rev Log: [USBOHCI] - Consider device speed when building the device endpoint descriptor Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h [iso-8859-1] Fri Feb 3 11:02:37 2012 @@ -402,6 +402,7 @@ IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, + IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) = 0; @@ -411,9 +412,11 @@ // // Description: initializes the request with an IRP // The irp contains an URB block which contains all necessary information +// contains the device speed (FullSpeed / LowSpeed) virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, - IN OUT PIRP Irp) = 0; + IN OUT PIRP Irp, + IN USB_DEVICE_SPEED DeviceSpeed) = 0; //----------------------------------------------------------------------------------------- // Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Fri Feb 3 11:02:37 2012 @@ -36,8 +36,8 @@ } // IUSBRequest interface functions - virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); - virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp); + virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); + virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp, IN USB_DEVICE_SPEED DeviceSpeed); virtual BOOLEAN IsRequestComplete(); virtual ULONG GetTransferType(); virtual NTSTATUS GetEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutEndpointDescriptor); @@ -136,6 +136,15 @@ NTSTATUS m_NtStatusCode; ULONG m_UrbStatusCode; + // + // device speed + // + USB_DEVICE_SPEED m_DeviceSpeed; + + // + // store urb + // + PURB m_Urb; }; //---------------------------------------------------------------------------------------- @@ -155,6 +164,7 @@ IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, + IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) { @@ -174,6 +184,7 @@ m_DeviceAddress = DeviceAddress; m_EndpointDescriptor = EndpointDescriptor; m_TotalBytesTransferred = 0; + m_DeviceSpeed = DeviceSpeed; // // Set Length Completed to 0 @@ -206,10 +217,10 @@ NTSTATUS CUSBRequest::InitializeWithIrp( IN PDMAMEMORYMANAGER DmaManager, - IN OUT PIRP Irp) + IN OUT PIRP Irp, + IN USB_DEVICE_SPEED DeviceSpeed) { PIO_STACK_LOCATION IoStack; - PURB Urb; // // sanity checks @@ -235,7 +246,7 @@ // // get urb // - Urb = (PURB)IoStack->Parameters.Others.Argument1; + m_Urb = (PURB)IoStack->Parameters.Others.Argument1; // // store irp @@ -243,38 +254,43 @@ m_Irp = Irp; // + // store speed + // + m_DeviceSpeed = DeviceSpeed; + + // // check function type // - switch (Urb->UrbHeader.Function) + switch (m_Urb->UrbHeader.Function) { case URB_FUNCTION_ISOCH_TRANSFER: { // // there must be at least one packet // - ASSERT(Urb->UrbIsochronousTransfer.NumberOfPackets); + ASSERT(m_Urb->UrbIsochronousTransfer.NumberOfPackets); // // is there data to be transferred // - if (Urb->UrbIsochronousTransfer.TransferBufferLength) + if (m_Urb->UrbIsochronousTransfer.TransferBufferLength) { // // Check if there is a MDL // - if (!Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL) + if (!m_Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL) { // // sanity check // - PC_ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer); + PC_ASSERT(m_Urb->UrbBulkOrInterruptTransfer.TransferBuffer); // // Create one using TransferBuffer // - DPRINT("Creating Mdl from Urb Buffer %p Length %lu\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); - m_TransferBufferMDL = IoAllocateMdl(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, - Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, + DPRINT("Creating Mdl from Urb Buffer %p Length %lu\n", m_Urb->UrbBulkOrInterruptTransfer.TransferBuffer, m_Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + m_TransferBufferMDL = IoAllocateMdl(m_Urb->UrbBulkOrInterruptTransfer.TransferBuffer, + m_Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, FALSE, FALSE, NULL); @@ -298,14 +314,14 @@ // // use provided mdl // - m_TransferBufferMDL = Urb->UrbIsochronousTransfer.TransferBufferMDL; + m_TransferBufferMDL = m_Urb->UrbIsochronousTransfer.TransferBufferMDL; } } // // save buffer length // - m_TransferBufferLength = Urb->UrbIsochronousTransfer.TransferBufferLength; + m_TransferBufferLength = m_Urb->UrbIsochronousTransfer.TransferBufferLength; // // Set Length Completed to 0 @@ -315,7 +331,7 @@ // // get endpoint descriptor // - m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbIsochronousTransfer.PipeHandle; + m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)m_Urb->UrbIsochronousTransfer.PipeHandle; // // completed initialization @@ -332,24 +348,24 @@ // // bulk interrupt transfer // - if (Urb->UrbBulkOrInterruptTransfer.TransferBufferLength) + if (m_Urb->UrbBulkOrInterruptTransfer.TransferBufferLength) { // // Check if there is a MDL // - if (!Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL) + if (!m_Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL) { // // sanity check // - PC_ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer); + PC_ASSERT(m_Urb->UrbBulkOrInterruptTransfer.TransferBuffer); // // Create one using TransferBuffer // - DPRINT("Creating Mdl from Urb Buffer %p Length %lu\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); - m_TransferBufferMDL = IoAllocateMdl(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, - Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, + DPRINT("Creating Mdl from Urb Buffer %p Length %lu\n", m_Urb->UrbBulkOrInterruptTransfer.TransferBuffer, m_Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + m_TransferBufferMDL = IoAllocateMdl(m_Urb->UrbBulkOrInterruptTransfer.TransferBuffer, + m_Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, FALSE, FALSE, NULL); @@ -374,13 +390,13 @@ } else { - m_TransferBufferMDL = Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL; + m_TransferBufferMDL = m_Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL; } // // save buffer length // - m_TransferBufferLength = Urb->UrbBulkOrInterruptTransfer.TransferBufferLength; + m_TransferBufferLength = m_Urb->UrbBulkOrInterruptTransfer.TransferBufferLength; // // Set Length Completed to 0 @@ -390,13 +406,13 @@ // // get endpoint descriptor // - m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; + m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)m_Urb->UrbBulkOrInterruptTransfer.PipeHandle; } break; } default: - DPRINT1("URB Function: not supported %x\n", Urb->UrbHeader.Function); + DPRINT1("URB Function: not supported %x\n", m_Urb->UrbHeader.Function); PC_ASSERT(FALSE); } @@ -971,9 +987,29 @@ } // - // FIXME: detect type - // - Descriptor->Flags |= OHCI_ENDPOINT_FULL_SPEED; + // set type + // + if (m_DeviceSpeed == UsbFullSpeed) + { + // + // device is full speed + // + Descriptor->Flags |= OHCI_ENDPOINT_FULL_SPEED; + } + else if (m_DeviceSpeed == UsbLowSpeed) + { + // + // device is full speed + // + Descriptor->Flags |= OHCI_ENDPOINT_LOW_SPEED; + } + else + { + // + // error + // + ASSERT(FALSE); + } Descriptor->HeadPhysicalDescriptor = 0; Descriptor->NextPhysicalEndpoint = 0; @@ -1098,6 +1134,19 @@ // CurrentDescriptor->BufferPhysical = MmGetPhysicalAddress(Buffer).LowPart; CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + CurrentSize - 1; + +#if 0 + if (m_Urb != NULL) + { + if (m_Urb->UrbBulkOrInterruptTransfer.TransferFlags & USBD_SHORT_TRANSFER_OK) + { + // + // indicate short packet support + // + CurrentDescriptor->Flags |= OHCI_TD_BUFFER_ROUNDING; + } + } +#endif // // is there a previous descriptor @@ -1298,16 +1347,15 @@ } // - // FIXME verify short packets are ok - // - //DataDescriptor->Flags |= OHCI_TD_BUFFER_ROUNDING; + // use short packets + // + DataDescriptor->Flags |= OHCI_TD_BUFFER_ROUNDING; // // store physical address of buffer // DataDescriptor->BufferPhysical = MmGetPhysicalAddress(MmGetMdlVirtualAddress(m_TransferBufferMDL)).LowPart; DataDescriptor->LastPhysicalByteAddress = DataDescriptor->BufferPhysical + m_TransferBufferLength - 1; - } //

1 0

[janderwald] 55389: [USBOHCI] - Check if the transfer descriptors reported errors and propagate the error in the urb status field - OHCI now reports error which the class driver are handling - Allo...
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 09:52:29 2012 New Revision: 55389 URL: http://svn.reactos.org/svn/reactos?rev=55389&view=rev Log: [USBOHCI] - Check if the transfer descriptors reported errors and propagate the error in the urb status field - OHCI now reports error which the class driver are handling - Allocate device descriptor from non paged pool to prevent possible alignment problems - Fix checking of completed transfer descriptors - Fix double freeing of descriptors - Cleanup endpoints when the halted bit is set by the host controllers - Check for the endpoint direction in the data descriptor - Setup descriptor needs buffer rounding set Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 3 09:52:29 2012 @@ -1457,6 +1457,8 @@ // the interrupt was not caused by DoneHead update // check if something important happened // + DPRINT1("InterruptStatus %x InterruptEnable %x\n", READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)), + READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET))); Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD); if (Status == 0) { Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h [iso-8859-1] Fri Feb 3 09:52:29 2012 @@ -239,7 +239,8 @@ #define OHCI_ENDPOINT_DIRECTION_IN 0x00001000 #define OHCI_ENDPOINT_GENERAL_FORMAT 0x00000000 #define OHCI_ENDPOINT_ISOCHRONOUS_FORMAT 0x00008000 - +#define OHCI_ENDPOINT_HEAD_MASK 0xfffffffc +#define OHCI_ENDPOINT_HALTED 0x00000001 // // Maximum port count set by OHCI // Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 09:52:29 2012 @@ -1763,8 +1763,13 @@ // // assert on failure // - PC_ASSERT(NT_SUCCESS(Status)); - + if (!NT_SUCCESS(Status)) + { + // + // display error + // + DPRINT1("URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", Urb->UrbHeader.Status); + } // // done Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Feb 3 09:52:29 2012 @@ -598,11 +598,24 @@ USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; PMDL Mdl; NTSTATUS Status; + PVOID DeviceDescriptor; + + // + // allocate descriptor page aligned + // + DeviceDescriptor = ExAllocatePool(NonPagedPool, PAGE_SIZE); + if (!DeviceDescriptor) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } // // zero descriptor // - RtlZeroMemory(&m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + RtlZeroMemory(DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); // @@ -616,7 +629,7 @@ // // allocate mdl describing the device descriptor // - Mdl = IoAllocateMdl(&m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR), FALSE, FALSE, 0); + Mdl = IoAllocateMdl(DeviceDescriptor, PAGE_SIZE, FALSE, FALSE, 0); if (!Mdl) { // @@ -643,10 +656,20 @@ if (NT_SUCCESS(Status)) { // + // copy back device descriptor + // + RtlCopyMemory(&m_DeviceDescriptor, DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + + // // informal dbg print // DumpDeviceDescriptor(&m_DeviceDescriptor); } + + // + // free item + // + ExFreePool(DeviceDescriptor); // // done Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Fri Feb 3 09:52:29 2012 @@ -363,7 +363,7 @@ // // check if the transfer descriptor is inside the list // - if (IsTransferDescriptorInEndpoint(EndpointDescriptor, TransferDescriptorLogicalAddress)) + if ((EndpointDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_HEAD_MASK) == EndpointDescriptor->TailPhysicalDescriptor || (EndpointDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_HALTED)) { // // found endpoint @@ -585,13 +585,6 @@ Request->FreeEndpointDescriptor(EndpointDescriptor); // - // FIXME: check if complete - // - //ASSERT(Request->IsRequestComplete()); - - Request->FreeEndpointDescriptor(EndpointDescriptor); - - // // release request // Request->Release(); Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Fri Feb 3 09:52:29 2012 @@ -64,6 +64,8 @@ NTSTATUS CreateIsochronousTransferDescriptor(OUT POHCI_ISO_TD *OutDescriptor, ULONG FrameCount); UCHAR GetEndpointAddress(); USHORT GetMaxPacketSize(); + VOID CheckError(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); + // constructor / destructor CUSBRequest(IUnknown *OuterUnknown){} @@ -968,7 +970,6 @@ } - // // FIXME: detect type // @@ -1269,7 +1270,37 @@ // // initialize data descriptor // - DataDescriptor->Flags = OHCI_TD_BUFFER_ROUNDING| OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_TOGGLE_CARRY | OHCI_TD_DIRECTION_PID_IN; + DataDescriptor->Flags = OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_TOGGLE_CARRY | OHCI_TD_TOGGLE_1; + + if (m_EndpointDescriptor) + { + if (USB_ENDPOINT_DIRECTION_OUT(m_EndpointDescriptor->bEndpointAddress)) + { + // + // direction out + // + DataDescriptor->Flags |= OHCI_TD_DIRECTION_PID_OUT; + } + else + { + // + // direction in + // + DataDescriptor->Flags |= OHCI_TD_DIRECTION_PID_IN; + } + } + else + { + // + // no end point address provided - assume its an in direction + // + DataDescriptor->Flags |= OHCI_TD_DIRECTION_PID_IN; + } + + // + // FIXME verify short packets are ok + // + //DataDescriptor->Flags |= OHCI_TD_BUFFER_ROUNDING; // // store physical address of buffer @@ -1282,7 +1313,7 @@ // // initialize setup descriptor // - SetupDescriptor->Flags = OHCI_TD_DIRECTION_PID_SETUP | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_0 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE); + SetupDescriptor->Flags = OHCI_TD_BUFFER_ROUNDING | OHCI_TD_DIRECTION_PID_SETUP | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_0 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE); if (m_SetupPacket) { @@ -1561,6 +1592,134 @@ } VOID +CUSBRequest::CheckError( + struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor) +{ + POHCI_GENERAL_TD TransferDescriptor; + ULONG ConditionCode; + PURB Urb; + PIO_STACK_LOCATION IoStack; + + + // + // set status code + // + m_NtStatusCode = STATUS_SUCCESS; + m_UrbStatusCode = USBD_STATUS_SUCCESS; + + + if (OutDescriptor->Flags & OHCI_ENDPOINT_ISOCHRONOUS_FORMAT) + { + // + // FIXME: handle isochronous support + // + ASSERT(FALSE); + } + else + { + // + // get first general transfer descriptor + // + TransferDescriptor = (POHCI_GENERAL_TD)OutDescriptor->HeadLogicalDescriptor; + + while(TransferDescriptor) + { + // + // the descriptor must have been processed + // + ASSERT(OHCI_TD_GET_CONDITION_CODE(TransferDescriptor->Flags) != OHCI_TD_CONDITION_NOT_ACCESSED); + + // + // get condition code + // + ConditionCode = OHCI_TD_GET_CONDITION_CODE(TransferDescriptor->Flags); + if (ConditionCode != OHCI_TD_CONDITION_NO_ERROR) + { + // + // FIXME status code + // + m_NtStatusCode = STATUS_UNSUCCESSFUL; + + switch(ConditionCode) + { + case OHCI_TD_CONDITION_CRC_ERROR: + DPRINT1("OHCI_TD_CONDITION_CRC_ERROR detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_CRC; + break; + case OHCI_TD_CONDITION_BIT_STUFFING: + DPRINT1("OHCI_TD_CONDITION_BIT_STUFFING detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_BTSTUFF; + break; + case OHCI_TD_CONDITION_TOGGLE_MISMATCH: + DPRINT1("OHCI_TD_CONDITION_TOGGLE_MISMATCH detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_DATA_TOGGLE_MISMATCH; + break; + case OHCI_TD_CONDITION_STALL: + DPRINT1("OHCI_TD_CONDITION_STALL detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_STALL_PID; + break; + case OHCI_TD_CONDITION_NO_RESPONSE: + DPRINT1("OHCI_TD_CONDITION_NO_RESPONSE detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_DEV_NOT_RESPONDING; + break; + case OHCI_TD_CONDITION_PID_CHECK_FAILURE: + DPRINT1("OHCI_TD_CONDITION_PID_CHECK_FAILURE detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_PID_CHECK_FAILURE; + break; + case OHCI_TD_CONDITION_UNEXPECTED_PID: + DPRINT1("OHCI_TD_CONDITION_UNEXPECTED_PID detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_UNEXPECTED_PID; + break; + case OHCI_TD_CONDITION_DATA_OVERRUN: + DPRINT1("OHCI_TD_CONDITION_DATA_OVERRUN detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_DATA_OVERRUN; + break; + case OHCI_TD_CONDITION_DATA_UNDERRUN: + if (m_Irp) + { + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(m_Irp); + + // + // get urb + // + Urb = (PURB)IoStack->Parameters.Others.Argument1; + + if(Urb->UrbBulkOrInterruptTransfer.TransferFlags & USBD_SHORT_TRANSFER_OK) + { + // + // short packets are ok + // + ASSERT(Urb->UrbHeader.Function == URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER); + m_NtStatusCode = STATUS_SUCCESS; + break; + } + } + DPRINT1("OHCI_TD_CONDITION_DATA_UNDERRUN detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_DATA_UNDERRUN; + break; + case OHCI_TD_CONDITION_BUFFER_OVERRUN: + DPRINT1("OHCI_TD_CONDITION_BUFFER_OVERRUN detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_BUFFER_OVERRUN; + break; + case OHCI_TD_CONDITION_BUFFER_UNDERRUN: + DPRINT1("OHCI_TD_CONDITION_BUFFER_UNDERRUN detected in TransferDescriptor TransferDescriptor %p\n", TransferDescriptor); + m_UrbStatusCode = USBD_STATUS_BUFFER_UNDERRUN; + break; + } + } + + // + // get next + // + TransferDescriptor = (POHCI_GENERAL_TD)TransferDescriptor->NextLogicalDescriptor; + } + } +} + +VOID CUSBRequest::CompletionCallback( struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor) { @@ -1570,17 +1729,16 @@ DPRINT("CUSBRequest::CompletionCallback Descriptor %p PhysicalAddress %x\n", OutDescriptor, OutDescriptor->PhysicalAddress.LowPart); // - // set status code - // - m_NtStatusCode = STATUS_SUCCESS; - m_UrbStatusCode = USBD_STATUS_SUCCESS; + // check for errors + // + CheckError(OutDescriptor); if (m_Irp) { // // set irp completion status // - m_Irp->IoStatus.Status = STATUS_SUCCESS; //FIXME + m_Irp->IoStatus.Status = m_NtStatusCode; // // get current irp stack location @@ -1595,7 +1753,7 @@ // // store urb status // - Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; //FIXME + Urb->UrbHeader.Status = m_UrbStatusCode; // // Check if the MDL was created

1 0

[zguo] 55388: Merge in r55173 as per Amine's request. Also apply Cameron's patch that attempts to hack around the memory manager bug.
by zguo＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: zguo Date: Fri Feb 3 03:51:58 2012 New Revision: 55388 URL: http://svn.reactos.org/svn/reactos?rev=55388&view=rev Log: Merge in r55173 as per Amine's request. Also apply Cameron's patch that attempts to hack around the memory manager bug. Modified: branches/ros-branch-0_3_14/ (props changed) branches/ros-branch-0_3_14/boot/freeldr/freeldr/arch/i386/hardware.c branches/ros-branch-0_3_14/ntoskrnl/include/internal/i386/ke.h Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 3 03:51:58 2012 @@ -11,4 +11,4 @@ /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 /branches/wlan-bringup:54809-54998 -/trunk/reactos:55012 +/trunk/reactos:55012,55173 Modified: branches/ros-branch-0_3_14/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/boot/freeldr/… ============================================================================== --- branches/ros-branch-0_3_14/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Fri Feb 3 03:51:58 2012 @@ -250,7 +250,8 @@ TRACE("Estimated buffer size %u\n", NodeSize * NodeCount); /* Set 'Configuration Data' value */ - Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + (NodeSize * NodeCount); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + + sizeof(CM_PNP_BIOS_INSTALLATION_CHECK) + (NodeSize * NodeCount); PartialResourceList = MmHeapAlloc(Size); if (PartialResourceList == NULL) { @@ -268,8 +269,8 @@ PartialResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - Ptr = (char *)(((ULONG_PTR)&PartialResourceList->PartialDescriptors[0]) + - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + /* The buffer starts after PartialResourceList->PartialDescriptors[0] */ + Ptr = (char *)(PartialResourceList + 1); /* Set instalation check data */ memcpy (Ptr, InstData, sizeof(CM_PNP_BIOS_INSTALLATION_CHECK)); @@ -291,6 +292,12 @@ DeviceNode->Node, DeviceNode->Size, DeviceNode->Size); + + if (PnpBufferSize + DeviceNode->Size > Size) + { + ERR("Buffer too small!\n"); + break; + } memcpy (Ptr, DeviceNode, Modified: branches/ros-branch-0_3_14/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/ntoskrnl/incl… ============================================================================== --- branches/ros-branch-0_3_14/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Fri Feb 3 03:51:58 2012 @@ -243,8 +243,8 @@ VOID KeInvalidateTlbEntry(IN PVOID Address) { - /* Invalidate the TLB entry for this address */ - __invlpg(Address); + /* HACK: Flush the entire TLB */ + __writecr3(__readcr3()); } FORCEINLINE

1 0

[janderwald] 55387: [EHCI] - Explictely clear bios owned flag and remove all SMI interrupts
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 23:35:56 2012 New Revision: 55387 URL: http://svn.reactos.org/svn/reactos?rev=55387&view=rev Log: [EHCI] - Explictely clear bios owned flag and remove all SMI interrupts Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Feb 2 23:35:56 2012 @@ -644,10 +644,24 @@ else if ((Caps & EHCI_LEGSUP_OSOWNED)) { // - // HC OS Owned Semaphore EHCI 2.1.8 + // HC OS Owned Semaphore EHCI 2.1.7 // DPRINT1("[EHCI] acquired ownership\n"); } + + // + // explictly clear the bios owned flag 2.1.7 + // + Value = 0; + m_BusInterface.SetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, ExtendedCapsSupport+2, sizeof(UCHAR)); + + // + // clear SMI interrupt EHCI 2.1.8 + // + Caps = 4; + m_BusInterface.SetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Caps, ExtendedCapsSupport+4, sizeof(ULONG)); + + } } }

1 0

[janderwald] 55386: [USBEHCI] - Check for bios ownership - Acquire ownership if bios owns it - Verify ownership
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 23:09:53 2012 New Revision: 55386 URL: http://svn.reactos.org/svn/reactos?rev=55386&view=rev Log: [USBEHCI] - Check for bios ownership - Acquire ownership if bios owns it - Verify ownership Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Feb 2 23:09:53 2012 @@ -124,7 +124,7 @@ WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback ULONG m_SyncFramePhysAddr; // periodic frame list physical address BOOLEAN m_ResetInProgress[16]; // set when a reset is in progress - + BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface // read register ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); @@ -159,7 +159,6 @@ PDEVICE_OBJECT PhysicalDeviceObject, PDEVICE_OBJECT LowerDeviceObject) { - BUS_INTERFACE_STANDARD BusInterface; PCI_COMMON_CONFIG PciConfig; NTSTATUS Status; ULONG BytesRead; @@ -207,14 +206,14 @@ m_VendorID = 0; m_DeviceID = 0; - Status = GetBusInterface(PhysicalDeviceObject, &BusInterface); + Status = GetBusInterface(PhysicalDeviceObject, &m_BusInterface); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get BusInteface!\n"); return Status; } - BytesRead = (*BusInterface.GetBusData)(BusInterface.Context, + BytesRead = (*m_BusInterface.GetBusData)(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, @@ -241,9 +240,9 @@ DPRINT1("PCI Configuration shows this as a non Bus Mastering device! Enabling...\n"); PciConfig.Command |= PCI_ENABLE_BUS_MASTER; - BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); - - BytesRead = (*BusInterface.GetBusData)(BusInterface.Context, + m_BusInterface.SetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); + + BytesRead = (*m_BusInterface.GetBusData)(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, @@ -375,9 +374,6 @@ DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); DPRINT1("Controler EHCI Caps PowerControl %x\n", m_Capabilities.HCSParams.PortPowerControl); - - - if (m_Capabilities.HCSParams.PortRouteRules) { Count = 0; @@ -566,7 +562,9 @@ CUSBHardwareDevice::StartController(void) { EHCI_USBCMD_CONTENT UsbCmd; - ULONG UsbSts, FailSafe; + ULONG UsbSts, FailSafe, ExtendedCapsSupport, Caps, Index; + UCHAR Value; + LARGE_INTEGER Timeout; // // check caps @@ -578,6 +576,82 @@ // EHCI_WRITE_REGISTER_ULONG(EHCI_CTRLDSSEGMENT, 0x0); } + + // + // are extended caps supported + // + ExtendedCapsSupport = (m_Capabilities.HCCParamsLong >> EHCI_ECP_SHIFT) & EHCI_ECP_MASK; + if (ExtendedCapsSupport) + { + DPRINT1("[EHCI] Extended Caps Support detected!\n"); + + // + // sanity check + // + ASSERT(ExtendedCapsSupport >= PCI_COMMON_HDR_LENGTH); + m_BusInterface.GetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Caps, ExtendedCapsSupport, sizeof(ULONG)); + + // + // OS Handoff Synchronization support capability. EHCI 5.1 + // + if ((Caps & EHCI_LEGSUP_CAPID_MASK) == EHCI_LEGSUP_CAPID) + { + // + // is it bios owned + // + if ((Caps & EHCI_LEGSUP_BIOSOWNED)) + { + DPRINT1("[EHCI] Controller is BIOS owned, acquring control\n"); + + // + // acquire ownership + // + Value = 1; + m_BusInterface.SetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, ExtendedCapsSupport+3, sizeof(UCHAR)); + + for(Index = 0; Index < 20; Index++) + { + // + // get status + // + m_BusInterface.GetBusData(m_BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Caps, ExtendedCapsSupport, sizeof(ULONG)); + if ((Caps & EHCI_LEGSUP_BIOSOWNED)) + { + // + // lets wait a bit + // + Timeout.QuadPart = 50; + DPRINT1("Waiting %d milliseconds for port reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } + } + if ((Caps & EHCI_LEGSUP_BIOSOWNED)) + { + // + // failed to aquire ownership + // + DPRINT1("[EHCI] failed to acquire ownership\n"); + } + else if ((Caps & EHCI_LEGSUP_OSOWNED)) + { + // + // HC OS Owned Semaphore EHCI 2.1.8 + // + DPRINT1("[EHCI] acquired ownership\n"); + } + } + } + } + #if 1 @@ -697,9 +771,6 @@ // Set port routing to EHCI controller // EHCI_WRITE_REGISTER_ULONG(EHCI_CONFIGFLAG, 1); - - - DPRINT1("EHCI Started!\n"); return STATUS_SUCCESS; Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Thu Feb 2 23:09:53 2012 @@ -11,6 +11,18 @@ #define EHCI_HCSPARAMS 0x04 #define EHCI_HCCPARAMS 0x08 #define EHCI_HCSP_PORTROUTE 0x0c + + +// +// Extended Capabilities +// +#define EHCI_ECP_SHIFT 8 +#define EHCI_ECP_MASK 0xff +#define EHCI_LEGSUP_CAPID_MASK 0xff +#define EHCI_LEGSUP_CAPID 0x01 +#define EHCI_LEGSUP_OSOWNED (1 << 24) +#define EHCI_LEGSUP_BIOSOWNED (1 << 16) + // // EHCI Operational Registers

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012