Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[janderwald] 55516: [USBEHCI] - Revert 55515, 55502, 55491, 55490, 55489 as it breaks mass storage support in VBox + Vmware

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 9 19:11:13 2012 New Revision: 55516 URL: http://svn.reactos.org/svn/reactos?rev=55516&view=rev Log: [USBEHCI] - Revert 55515, 55502, 55491, 55490, 55489 as it breaks mass storage support in VBox + Vmware Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.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 9 19:11:13 2012 @@ -32,11 +32,6 @@ NTAPI StatusChangeWorkItemRoutine(PVOID Context); -VOID -NTAPI -QueueHeadCompletionRoutine(PVOID Context); - - class CUSBHardwareDevice : public IUSBHardwareDevice { public: @@ -99,7 +94,6 @@ friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); friend VOID NTAPI EhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); friend VOID NTAPI StatusChangeWorkItemRoutine(PVOID Context); - friend VOID NTAPI QueueHeadCompletionRoutine(PVOID Context); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} virtual ~CUSBHardwareDevice(){} @@ -1312,37 +1306,6 @@ return TRUE; } -typedef struct -{ - WORK_QUEUE_ITEM QueueHeadWorkItem; - CUSBHardwareDevice * This; - -}QUEUE_HEAD_COMPLETION, *PQUEUE_HEAD_COMPLETION; - - -VOID -NTAPI -QueueHeadCompletionRoutine( - IN PVOID Ctx) -{ - // - // cast to hardware object - // - PQUEUE_HEAD_COMPLETION Context = (PQUEUE_HEAD_COMPLETION)Ctx; - - // - // now notify IUSBQueue that it can free completed requests - // - Context->This->m_UsbQueue->CompleteAsyncRequests(); - - // - // door ring bell completed - // - Context->This->m_DoorBellRingInProgress = FALSE; - - ExFreePool(Context); -} - VOID NTAPI EhciDefferedRoutine( IN PKDPC Dpc, @@ -1354,7 +1317,6 @@ ULONG CStatus, PortStatus, PortCount, i, ShouldRingDoorBell; NTSTATUS Status = STATUS_SUCCESS; EHCI_USBCMD_CONTENT UsbCmd; - PQUEUE_HEAD_COMPLETION Context; This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; @@ -1377,7 +1339,6 @@ // controller reported error // DPRINT1("CStatus %x\n", CStatus); - ASSERT(FALSE); } // @@ -1424,22 +1385,14 @@ PC_ASSERT(This->m_DoorBellRingInProgress == TRUE); // - // get command register - // - This->GetCommandRegister(&UsbCmd); - ASSERT(UsbCmd.DoorBell == FALSE); - - // - // allocate work item context - // - Context = (PQUEUE_HEAD_COMPLETION)ExAllocatePool(NonPagedPool, sizeof(QUEUE_HEAD_COMPLETION)); - if (Context) - { - ExInitializeWorkItem(&Context->QueueHeadWorkItem, QueueHeadCompletionRoutine, Context); - Context->This = This; - ExQueueWorkItem(&Context->QueueHeadWorkItem, DelayedWorkQueue); - } - + // now notify IUSBQueue that it can free completed requests + // + This->m_UsbQueue->CompleteAsyncRequests(); + + // + // door ring bell completed + // + This->m_DoorBellRingInProgress = FALSE; } This->GetDeviceDetails(NULL, NULL, &PortCount, NULL); 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 9 19:11:13 2012 @@ -148,7 +148,7 @@ //Software ULONG PhysicalAddr; - LIST_ENTRY DescriptorEntry; + LIST_ENTRY LinkedDescriptors; ULONG TotalBytesToTransfer; } QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; @@ -216,21 +216,9 @@ //Software ULONG PhysicalAddr; LIST_ENTRY LinkedQueueHeads; - LIST_ENTRY TransferDescriptorListHead; PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; -C_ASSERT(sizeof(END_POINT_CHARACTERISTICS) == 4); -C_ASSERT(sizeof(END_POINT_CAPABILITIES) == 4); - -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, HorizontalLinkPointer) == 0x00); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, EndPointCharacteristics) == 0x04); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, EndPointCapabilities) == 0x08); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, CurrentLinkPointer) == 0xC); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, NextPointer) == 0x10); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, AlternateNextPointer) == 0x14); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, Token) == 0x18); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, BufferPointer) == 0x1C); C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, PhysicalAddr) == 0x30); @@ -304,4 +292,3 @@ ULONG PortChange; }EHCI_PORT_STATUS; - Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Thu Feb 9 19:11:13 2012 @@ -70,9 +70,6 @@ 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); @@ -1678,21 +1675,12 @@ // // initialize setup packet // - CtrlSetup.bmRequestType.B = 0x22; //FIXME: Const. + CtrlSetup.bmRequestType.B = 0xa2; //FIXME: Const. CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; - if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) - { - // - // data direction is device to host - // - CtrlSetup.bmRequestType.B |= 0x80; - } - - // // issue request // @@ -1709,185 +1697,6 @@ // return Status; } - -NTSTATUS -CHubController::HandleSyncResetAndClearStall( - IN OUT PIRP Irp, - IN OUT PURB Urb) -{ - NTSTATUS Status = STATUS_SUCCESS; - PUSB_ENDPOINT 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)Urb->UrbPipeRequest.PipeHandle; - - // - // get type - // - Type = (EndpointDescriptor->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); - - // - // reset data toggle - // - ASSERT(NT_SUCCESS(Status)); - EndpointDescriptor->DataToggle = 0x0; - - // - // done - // - return Status; -} - -NTSTATUS -CHubController::HandleAbortPipe( - IN OUT PIRP Irp, - IN OUT PURB Urb) -{ - 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 @@ -1938,20 +1747,12 @@ // // initialize setup packet // - CtrlSetup.bmRequestType.B = 0x21; + CtrlSetup.bmRequestType.B = 0xa1; //FIXME: Const. CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; - if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) - { - // - // data direction is device to host - // - CtrlSetup.bmRequestType.B |= 0x80; - } - // // issue request // @@ -1960,13 +1761,8 @@ // // assert on failure // - if (!NT_SUCCESS(Status)) - { - // - // display error - // - DPRINT1("URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", Urb->UrbHeader.Status); - } + PC_ASSERT(NT_SUCCESS(Status)); + // // done @@ -2010,16 +1806,6 @@ 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/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Thu Feb 9 19:11:13 2012 @@ -379,7 +379,6 @@ // struct _QUEUE_HEAD; -struct _USB_ENDPOINT; DECLARE_INTERFACE_(IUSBRequest, IUnknown) { @@ -396,7 +395,7 @@ virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, - IN OPTIONAL struct _USB_ENDPOINT *EndpointDescriptor, + IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) = 0; @@ -589,15 +588,6 @@ // This function gets called by IUSBHardware after it the Interrupt on Async Advance bit has been set virtual VOID CompleteAsyncRequests() = 0; - -//----------------------------------------------------------------------------------------- -// -// AbortDevicePipe -// -// Description: aborts all pending requsts of an device - - virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0; - }; typedef IUSBQueue *PUSBQUEUE; @@ -851,15 +841,6 @@ 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/usbehci_new/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Thu Feb 9 19:11:13 2012 @@ -10,6 +10,24 @@ #define INITGUID #include "usbehci.h" + +typedef struct _USB_ENDPOINT +{ + USB_ENDPOINT_DESCRIPTOR EndPointDescriptor; +} USB_ENDPOINT, *PUSB_ENDPOINT; + +typedef struct _USB_INTERFACE +{ + USB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + USB_ENDPOINT *EndPoints; +} USB_INTERFACE, *PUSB_INTERFACE; + +typedef struct _USB_CONFIGURATION +{ + USB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + USB_INTERFACE *Interfaces; +} USB_CONFIGURATION, *PUSB_CONFIGURATION; + class CUSBDevice : public IUSBDevice { @@ -52,12 +70,10 @@ 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); - virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl); + virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl); virtual NTSTATUS CreateConfigurationDescriptor(ULONG ConfigurationIndex); virtual NTSTATUS CreateDeviceDescriptor(); virtual VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); @@ -521,7 +537,7 @@ NTSTATUS CUSBDevice::CommitSetupPacket( IN PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, - IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, + IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl) { @@ -1257,23 +1273,6 @@ 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/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Thu Feb 9 19:11:13 2012 @@ -41,8 +41,6 @@ virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); virtual VOID InterruptCallback(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); virtual VOID CompleteAsyncRequests(); - virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor); - // constructor / destructor CUSBQueue(IUnknown *OuterUnknown){} @@ -501,6 +499,11 @@ // remove software link // RemoveEntryList(&QueueHead->LinkedQueueHeads); + + // + // FIXME: clear failure + // + QueueHead->Token.Bits.Halted = FALSE; } // @@ -626,7 +629,6 @@ // // walk async list // - ASSERT(AsyncListQueueHead); Entry = AsyncListQueueHead->LinkedQueueHeads.Flink; while(Entry != &AsyncListQueueHead->LinkedQueueHeads) @@ -635,7 +637,6 @@ // get queue head structure // QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - ASSERT(QueueHead); // // sanity check @@ -657,7 +658,7 @@ // IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead); - DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); + DPRINT1("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); // // check if queue head is complete @@ -929,16 +930,6 @@ } NTSTATUS -CUSBQueue::AbortDevicePipe( - IN UCHAR DeviceAddress, - IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - - -NTSTATUS CreateUSBQueue( PUSBQUEUE *OutUsbQueue) { @@ -971,4 +962,3 @@ // return STATUS_SUCCESS; } - Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Thu Feb 9 19:11:13 2012 @@ -36,7 +36,7 @@ } // IUSBRequest interface functions - virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); + 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 VOID CompletionCallback(IN NTSTATUS NtStatusCode, IN ULONG UrbStatusCode, IN struct _QUEUE_HEAD *QueueHead); virtual VOID CancelCallback(IN NTSTATUS NtStatusCode, IN struct _QUEUE_HEAD *QueueHead); @@ -62,10 +62,6 @@ NTSTATUS BuildSetupPacket(); NTSTATUS BuildSetupPacketFromURB(); ULONG InternalCalculateTransferLength(); - NTSTATUS BuildTransferDescriptorChain(IN PQUEUE_HEAD QueueHead, IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode, IN UCHAR InitialDataToggle, OUT PQUEUE_TRANSFER_DESCRIPTOR * OutFirstDescriptor, OUT PQUEUE_TRANSFER_DESCRIPTOR * OutLastDescriptor, OUT PUCHAR OutDataToggle, OUT PULONG OutTransferBufferOffset); - VOID InitDescriptor(IN PQUEUE_TRANSFER_DESCRIPTOR CurrentDescriptor, IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode, IN UCHAR DataToggle, OUT PULONG OutDescriptorLength); - VOID DumpQueueHead(IN PQUEUE_HEAD QueueHead); - // constructor / destructor CUSBRequest(IUnknown *OuterUnknown){} @@ -122,12 +118,17 @@ // // store end point address // - PUSB_ENDPOINT m_EndpointDescriptor; + PUSB_ENDPOINT_DESCRIPTOR m_EndpointDescriptor; // // DMA queue head // PQUEUE_HEAD m_QueueHead; + + // + // DMA transfer descriptors linked to the queue head + // + PQUEUE_TRANSFER_DESCRIPTOR m_TransferDescriptors[4]; // // allocated setup packet from the DMA pool @@ -140,8 +141,6 @@ // NTSTATUS m_NtStatusCode; ULONG m_UrbStatusCode; - - PVOID m_Base; }; @@ -161,7 +160,7 @@ IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, - IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, + IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) { @@ -322,7 +321,7 @@ // // get endpoint descriptor // - m_EndpointDescriptor = (PUSB_ENDPOINT)Urb->UrbBulkOrInterruptTransfer.PipeHandle; + m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; } break; @@ -588,7 +587,7 @@ // // end point is defined in the low byte of bmAttributes // - TransferType = (m_EndpointDescriptor->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK); + TransferType = (m_EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); } else { @@ -596,7 +595,6 @@ // initialized with setup packet, must be a control transfer // TransferType = USB_ENDPOINT_TYPE_CONTROL; - ASSERT(m_EndpointDescriptor == FALSE); } // @@ -608,243 +606,13 @@ UCHAR CUSBRequest::InternalGetPidDirection() { - if (m_EndpointDescriptor) - { - // - // end point direction is highest bit in bEndpointAddress - // - return (m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; - } - else - { - // - // request arrives on the control pipe, extract direction from setup packet - // - ASSERT(m_DescriptorPacket); - return (m_DescriptorPacket->bmRequestType.B >> 7); - } -} - -VOID -CUSBRequest::InitDescriptor( - IN PQUEUE_TRANSFER_DESCRIPTOR CurrentDescriptor, - IN PVOID TransferBuffer, - IN ULONG TransferBufferLength, - IN UCHAR PidCode, - IN UCHAR DataToggle, - OUT PULONG OutDescriptorLength) -{ - ULONG Index, Length = 0, PageOffset, BufferLength; - - // - // init transfer descriptor - // - CurrentDescriptor->Token.Bits.PIDCode = PidCode; - CurrentDescriptor->Token.Bits.TotalBytesToTransfer = 0; - CurrentDescriptor->Token.Bits.DataToggle = DataToggle; - - // - // sanity check - // - ASSERT(TransferBufferLength); - - // - // store buffers - // - Index = 0; - do - { - // - // use physical address - // - CurrentDescriptor->BufferPointer[Index] = MmGetPhysicalAddress(TransferBuffer).LowPart; - - // - // Get the offset from page size - // - PageOffset = BYTE_OFFSET(CurrentDescriptor->BufferPointer[Index]); - if (PageOffset != 0) - { - // - // move to next page - // - TransferBuffer = (PVOID)ROUND_TO_PAGES(TransferBuffer); - } - else - { - // - // move to next page - // - TransferBuffer = (PVOID)((ULONG_PTR)TransferBuffer + PAGE_SIZE); - } - - // - // calculate buffer length - // - BufferLength = min(TransferBufferLength, PAGE_SIZE - PageOffset); - - // - // increment transfer bytes - // - CurrentDescriptor->Token.Bits.TotalBytesToTransfer += BufferLength; - CurrentDescriptor->TotalBytesToTransfer += BufferLength; - Length += BufferLength; - DPRINT("Index %lu TransferBufferLength %lu PageOffset %x BufferLength %lu Buffer Phy %p TransferBuffer %p\n", Index, TransferBufferLength, PageOffset, BufferLength, CurrentDescriptor->BufferPointer[Index], TransferBuffer); - - // - // decrement available byte count - // - TransferBufferLength -= BufferLength; - if (TransferBufferLength == 0) - { - // - // end reached - // - break; - } - - // - // sanity check - // - if (Index > 1) - { - // - // no equal buffers - // - ASSERT(CurrentDescriptor->BufferPointer[Index] != CurrentDescriptor->BufferPointer[Index-1]); - } - - // - // next descriptor index - // - Index++; - }while(Index < 5); - - // - // store result - // - *OutDescriptorLength = Length; -} - - -NTSTATUS -CUSBRequest::BuildTransferDescriptorChain( - IN PQUEUE_HEAD QueueHead, - IN PVOID TransferBuffer, - IN ULONG TransferBufferLength, - IN UCHAR PidCode, - IN UCHAR InitialDataToggle, - OUT PQUEUE_TRANSFER_DESCRIPTOR * OutFirstDescriptor, - OUT PQUEUE_TRANSFER_DESCRIPTOR * OutLastDescriptor, - OUT PUCHAR OutDataToggle, - OUT PULONG OutTransferBufferOffset) -{ - PQUEUE_TRANSFER_DESCRIPTOR FirstDescriptor = NULL, CurrentDescriptor, LastDescriptor = NULL; - NTSTATUS Status; - ULONG DescriptorLength, TransferBufferOffset = 0; - - do - { - // - // allocate transfer descriptor - // - Status = CreateDescriptor(&CurrentDescriptor); - if (!NT_SUCCESS(Status)) - { - // - // failed to allocate transfer descriptor - // - ASSERT(FALSE); - return Status; - } - - // - // now init the descriptor - // - InitDescriptor(CurrentDescriptor, - (PVOID)((ULONG_PTR)TransferBuffer + TransferBufferOffset), - TransferBufferLength - TransferBufferOffset, - PidCode, - InitialDataToggle, - &DescriptorLength); - - // - // insert into queue head - // - InsertTailList(&QueueHead->TransferDescriptorListHead, &CurrentDescriptor->DescriptorEntry); - - // - // adjust offset - // - TransferBufferOffset += DescriptorLength; - - if (LastDescriptor) - { - // - // link to current descriptor - // - LastDescriptor->AlternateNextPointer = CurrentDescriptor->PhysicalAddr; - LastDescriptor->NextPointer = CurrentDescriptor->PhysicalAddr; - LastDescriptor = CurrentDescriptor; - } - else - { - // - // first descriptor in chain - // - LastDescriptor = FirstDescriptor = CurrentDescriptor; - } - - if(TransferBufferLength == TransferBufferOffset) - { - // - // end reached - // - break; - } - }while(TRUE); - - if (OutFirstDescriptor) - { - // - // store first descriptor - // - *OutFirstDescriptor = FirstDescriptor; - } - - if (OutLastDescriptor) - { - // - // store last descriptor - // - *OutLastDescriptor = CurrentDescriptor; - } - - if (OutDataToggle) - { - // - // flip data toggle - // - InitialDataToggle = !InitialDataToggle; - - // - // store result data toggle - // - *OutDataToggle = InitialDataToggle; - } - - if (OutTransferBufferOffset) - { - // - // store offset - // - *OutTransferBufferOffset = TransferBufferOffset; - } - - // - // done - // - return STATUS_SUCCESS; + ASSERT(m_Irp); + ASSERT(m_EndpointDescriptor); + + // + // end point is defined in the low byte of bEndpointAddress + // + return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; } //---------------------------------------------------------------------------------------- @@ -853,9 +621,8 @@ PQUEUE_HEAD * OutHead) { NTSTATUS Status; - ULONG DescriptorChainLength; + ULONG NumTransferDescriptors, Index; PQUEUE_HEAD QueueHead; - PQUEUE_TRANSFER_DESCRIPTOR SetupDescriptor, StatusDescriptor, FirstDescriptor, LastDescriptor; // // first allocate the queue head @@ -883,34 +650,30 @@ // // failed to allocate setup packet // - ASSERT(FALSE); return STATUS_INSUFFICIENT_RESOURCES; } // - // create setup descriptor - // - Status = CreateDescriptor(&SetupDescriptor); - if (!NT_SUCCESS(Status)) - { - // - // failed to allocate transfer descriptor - // - ASSERT(FALSE); - return Status; - } - - // - // create status descriptor - // - Status = CreateDescriptor(&StatusDescriptor); - if (!NT_SUCCESS(Status)) - { - // - // failed to allocate transfer descriptor - // - ASSERT(FALSE); - return Status; + // calculate num of transfer descriptors + // + NumTransferDescriptors = m_TransferBufferMDL != 0 ? 3 : 2; + + // + // allocate transfer descriptors + // + for(Index = 0; Index < NumTransferDescriptors; Index++) + { + // + // allocate transfer descriptor + // + Status = CreateDescriptor(&m_TransferDescriptors[Index]); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate transfer descriptor + // + return Status; + } } // @@ -923,86 +686,102 @@ // // set endpoint address and max packet length // - QueueHead->EndPointCharacteristics.EndPointNumber = m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0x0F; - QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; - } - - // - // init setup descriptor - // - SetupDescriptor->Token.Bits.PIDCode = PID_CODE_SETUP_TOKEN; - SetupDescriptor->Token.Bits.TotalBytesToTransfer = sizeof(USB_DEFAULT_PIPE_SETUP_PACKET); - SetupDescriptor->Token.Bits.DataToggle = FALSE; - SetupDescriptor->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); - InsertTailList(&QueueHead->TransferDescriptorListHead, &SetupDescriptor->DescriptorEntry); - - - // - // init status descriptor - // - StatusDescriptor->Token.Bits.TotalBytesToTransfer = 0; - StatusDescriptor->Token.Bits.DataToggle = TRUE; - StatusDescriptor->Token.Bits.InterruptOnComplete = TRUE; - - // - // is there data - // - if (m_TransferBufferLength) - { - Status = BuildTransferDescriptorChain(QueueHead, - MmGetMdlVirtualAddress(m_TransferBufferMDL), - m_TransferBufferLength, - InternalGetPidDirection(), - TRUE, - &FirstDescriptor, - &LastDescriptor, - NULL, - &DescriptorChainLength); - - // - // FIXME handle errors - // - ASSERT(Status == STATUS_SUCCESS); - ASSERT(DescriptorChainLength == m_TransferBufferLength); - - // - // now link the descriptors - // - SetupDescriptor->NextPointer = FirstDescriptor->PhysicalAddr; - SetupDescriptor->AlternateNextPointer = FirstDescriptor->PhysicalAddr; - LastDescriptor->NextPointer = StatusDescriptor->PhysicalAddr; - LastDescriptor->AlternateNextPointer = StatusDescriptor->PhysicalAddr; - - - // - // pid code is flipped for ops with data stage - // - StatusDescriptor->Token.Bits.PIDCode = !InternalGetPidDirection(); + QueueHead->EndPointCharacteristics.EndPointNumber = m_EndpointDescriptor->bEndpointAddress & 0x0F; + QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->wMaxPacketSize; + } + + // + // setup descriptors + // + m_TransferDescriptors[0]->Token.Bits.PIDCode = PID_CODE_SETUP_TOKEN; + m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer = sizeof(USB_DEFAULT_PIPE_SETUP_PACKET); + m_TransferDescriptors[0]->Token.Bits.DataToggle = FALSE; + m_TransferDescriptors[0]->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); + m_TransferDescriptors[0]->NextPointer = m_TransferDescriptors[1]->PhysicalAddr; + m_TransferDescriptors[0]->AlternateNextPointer = m_TransferDescriptors[1]->PhysicalAddr; + + if (m_TransferBufferMDL) + { + // + // setup in descriptor + // + m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; + m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer = m_TransferBufferLength; + m_TransferDescriptors[1]->NextPointer = m_TransferDescriptors[2]->PhysicalAddr; + m_TransferDescriptors[1]->Token.Bits.DataToggle = TRUE; + m_TransferDescriptors[1]->AlternateNextPointer = m_TransferDescriptors[2]->PhysicalAddr; + + // + // FIXME: check if the request spawns over a page -> fill other members + // + PC_ASSERT(m_TransferBufferLength <= PAGE_SIZE); + m_TransferDescriptors[1]->BufferPointer[0] = MmGetPhysicalAddress(MmGetMdlVirtualAddress(m_TransferBufferMDL)).LowPart; + + // + // setup out descriptor + // + m_TransferDescriptors[2]->Token.Bits.PIDCode = PID_CODE_OUT_TOKEN; + m_TransferDescriptors[2]->Token.Bits.TotalBytesToTransfer = 0; + m_TransferDescriptors[2]->Token.Bits.DataToggle = TRUE; + + // + // special case, setup alternative next descriptor in case of error + // HAIKU links to dead descriptor + // + + // + // interrupt on completion + // + m_TransferDescriptors[2]->Token.Bits.InterruptOnComplete = TRUE; } else { // - // direct link - // - SetupDescriptor->NextPointer = StatusDescriptor->PhysicalAddr; - SetupDescriptor->AlternateNextPointer = StatusDescriptor->PhysicalAddr; - - // - // retrieve result of operation - // - StatusDescriptor->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; - } - - // - // insert status descriptor - // - InsertTailList(&QueueHead->TransferDescriptorListHead, &StatusDescriptor->DescriptorEntry); - + // no buffer, setup in descriptor + // + m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; + m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer = 0; + m_TransferDescriptors[1]->Token.Bits.DataToggle = TRUE; + + // + // interrupt on completion + // + m_TransferDescriptors[1]->Token.Bits.InterruptOnComplete = TRUE; + } // // link transfer descriptors to queue head // - QueueHead->NextPointer = SetupDescriptor->PhysicalAddr; + QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; + + DPRINT("QueueHead %p Addr %x\n", QueueHead, QueueHead->PhysicalAddr); + DPRINT("NumDescriptors %lu\n", NumTransferDescriptors); + DPRINT("QueueHead AlternateNextPointer %x\n", QueueHead->AlternateNextPointer); + DPRINT("QueueHead NextPointer %x\n", QueueHead->NextPointer); + DPRINT("m_DescriptorSetupPacket HiPart %x LoPart %x\n", m_DescriptorSetupPacket.HighPart, m_DescriptorSetupPacket.LowPart); + + + DPRINT("TransferDescriptor 0 Addr %x\n", m_TransferDescriptors[0]->PhysicalAddr); + DPRINT("TransferDescriptor 0 Next %x\n", m_TransferDescriptors[0]->NextPointer); + DPRINT("TransferDescriptor 0 AlternativeNext %x\n", m_TransferDescriptors[0]->AlternateNextPointer); + DPRINT("TransferDescriptor 0 Buffer Pointer %x\n", m_TransferDescriptors[0]->BufferPointer[0]); + DPRINT("TransferDescriptor 0 TotalBytesToTransfer 0x%x\n", m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer); + + DPRINT("TransferDescriptor 1 Addr %x\n", m_TransferDescriptors[1]->PhysicalAddr); + DPRINT("TransferDescriptor 1 Next %x\n", m_TransferDescriptors[1]->NextPointer); + DPRINT("TransferDescriptor 1 AlternativeNext %x\n", m_TransferDescriptors[1]->AlternateNextPointer); + DPRINT("TransferDescriptor 1 Buffer Pointer %x\n", m_TransferDescriptors[1]->BufferPointer[0]); + DPRINT("TransferDescriptor 1 TotalBytesToTransfer 0x%x\n", m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer); + + if (NumTransferDescriptors == 3) + { + DPRINT("TransferDescriptor 2 Addr %x\n", m_TransferDescriptors[2]->PhysicalAddr); + DPRINT("TransferDescriptor 2 Next %x\n", m_TransferDescriptors[2]->NextPointer); + DPRINT("TransferDescriptor 2 AlternativeNext %x\n", m_TransferDescriptors[2]->AlternateNextPointer); + DPRINT("TransferDescriptor 2 Buffer Pointer %x\n", m_TransferDescriptors[2]->BufferPointer[0]); + DPRINT("TransferDescriptor 2 TotalBytesToTransfer 0x%x\n", m_TransferDescriptors[2]->Token.Bits.TotalBytesToTransfer); + } + // // store result @@ -1010,80 +789,10 @@ *OutHead = QueueHead; // - // displays the current request - // - //DumpQueueHead(QueueHead); - - DPRINT1("BuildControlTransferQueueHead done\n"); - // // done // return STATUS_SUCCESS; } - -VOID -CUSBRequest::DumpQueueHead( - IN PQUEUE_HEAD QueueHead) -{ - PLIST_ENTRY Entry; - PQUEUE_TRANSFER_DESCRIPTOR Descriptor; - ULONG Index = 0; - - DPRINT1("QueueHead %p Addr %x\n", QueueHead, QueueHead->PhysicalAddr); - DPRINT1("QueueHead AlternateNextPointer %x\n", QueueHead->AlternateNextPointer); - DPRINT1("QueueHead NextPointer %x\n", QueueHead->NextPointer); - - DPRINT1("QueueHead HubAddr %x\n", QueueHead->EndPointCharacteristics.ControlEndPointFlag); - DPRINT1("QueueHead DeviceAddress %x\n", QueueHead->EndPointCharacteristics.DeviceAddress); - DPRINT1("QueueHead EndPointNumber %x\n", QueueHead->EndPointCharacteristics.EndPointNumber); - DPRINT1("QueueHead EndPointSpeed %x\n", QueueHead->EndPointCharacteristics.EndPointSpeed); - DPRINT1("QueueHead HeadOfReclamation %x\n", QueueHead->EndPointCharacteristics.HeadOfReclamation); - DPRINT1("QueueHead InactiveOnNextTransaction %x\n", QueueHead->EndPointCharacteristics.InactiveOnNextTransaction); - DPRINT1("QueueHead MaximumPacketLength %x\n", QueueHead->EndPointCharacteristics.MaximumPacketLength); - DPRINT1("QueueHead NakCountReload %x\n", QueueHead->EndPointCharacteristics.NakCountReload); - DPRINT1("QueueHead QEDTDataToggleControl %x\n", QueueHead->EndPointCharacteristics.QEDTDataToggleControl); - DPRINT1("QueueHead HubAddr %x\n", QueueHead->EndPointCapabilities.HubAddr); - DPRINT1("QueueHead InterruptScheduleMask %x\n", QueueHead->EndPointCapabilities.InterruptScheduleMask); - DPRINT1("QueueHead NumberOfTransactionPerFrame %x\n", QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame); - DPRINT1("QueueHead PortNumber %x\n", QueueHead->EndPointCapabilities.PortNumber); - DPRINT1("QueueHead SplitCompletionMask %x\n", QueueHead->EndPointCapabilities.SplitCompletionMask); - - Entry = QueueHead->TransferDescriptorListHead.Flink; - while(Entry != &QueueHead->TransferDescriptorListHead) - { - // - // get transfer descriptor - // - Descriptor = (PQUEUE_TRANSFER_DESCRIPTOR)CONTAINING_RECORD(Entry, QUEUE_TRANSFER_DESCRIPTOR, DescriptorEntry); - - DPRINT1("TransferDescriptor %lu Addr %x\n", Index, Descriptor->PhysicalAddr); - DPRINT1("TransferDescriptor %lu Next %x\n", Index, Descriptor->NextPointer); - DPRINT1("TransferDescriptor %lu AlternateNextPointer %x\n", Index, Descriptor->AlternateNextPointer); - DPRINT1("TransferDescriptor %lu Active %lu\n", Index, Descriptor->Token.Bits.Active); - DPRINT1("TransferDescriptor %lu BabbleDetected %lu\n", Index, Descriptor->Token.Bits.BabbleDetected); - DPRINT1("TransferDescriptor %lu CurrentPage %lu\n", Index, Descriptor->Token.Bits.CurrentPage); - DPRINT1("TransferDescriptor %lu DataBufferError %lu\n", Index, Descriptor->Token.Bits.DataBufferError); - DPRINT1("TransferDescriptor %lu DataToggle %lu\n", Index, Descriptor->Token.Bits.DataToggle); - DPRINT1("TransferDescriptor %lu ErrorCounter %lu\n", Index, Descriptor->Token.Bits.ErrorCounter); - DPRINT1("TransferDescriptor %lu Halted %lu\n", Index, Descriptor->Token.Bits.Halted); - DPRINT1("TransferDescriptor %lu InterruptOnComplete %x\n", Index, Descriptor->Token.Bits.InterruptOnComplete); - DPRINT1("TransferDescriptor %lu MissedMicroFrame %lu\n", Index, Descriptor->Token.Bits.MissedMicroFrame); - DPRINT1("TransferDescriptor %lu PIDCode %lu\n", Index, Descriptor->Token.Bits.PIDCode); - DPRINT1("TransferDescriptor %lu PingState %lu\n", Index, Descriptor->Token.Bits.PingState); - DPRINT1("TransferDescriptor %lu SplitTransactionState %lu\n", Index, Descriptor->Token.Bits.SplitTransactionState); - DPRINT1("TransferDescriptor %lu TotalBytesToTransfer %lu\n", Index, Descriptor->Token.Bits.TotalBytesToTransfer); - DPRINT1("TransferDescriptor %lu TransactionError %lu\n", Index, Descriptor->Token.Bits.TransactionError); - - DPRINT1("TransferDescriptor %lu Buffer Pointer 0 %x\n", Index, Descriptor->BufferPointer[0]); - DPRINT1("TransferDescriptor %lu Buffer Pointer 1 %x\n", Index, Descriptor->BufferPointer[1]); - DPRINT1("TransferDescriptor %lu Buffer Pointer 2 %x\n", Index, Descriptor->BufferPointer[2]); - DPRINT1("TransferDescriptor %lu Buffer Pointer 3 %x\n", Index, Descriptor->BufferPointer[3]); - DPRINT1("TransferDescriptor %lu Buffer Pointer 4 %x\n", Index, Descriptor->BufferPointer[4]); - Entry = Entry->Flink; - Index++; - } -} - //---------------------------------------------------------------------------------------- NTSTATUS @@ -1092,9 +801,11 @@ { NTSTATUS Status; PQUEUE_HEAD QueueHead; + ULONG TransferDescriptorCount, Index; + ULONG BytesAvailable, BufferIndex; PVOID Base; - ULONG ChainDescriptorLength; - PQUEUE_TRANSFER_DESCRIPTOR FirstDescriptor, LastDescriptor; + ULONG PageOffset, CurrentTransferBufferLength; + UCHAR DataToggle; // // Allocate the queue head @@ -1115,81 +826,279 @@ PC_ASSERT(QueueHead); PC_ASSERT(m_TransferBufferLength); - if (!m_Base) - { - // - // get virtual base of mdl - // - m_Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); - } + // + // Max default of 3 descriptors + // + TransferDescriptorCount = 3; + + // + // get virtual base of mdl + // + Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); // // Increase the size of last transfer, 0 in case this is the first // - Base = (PVOID)((ULONG_PTR)m_Base + m_TransferBufferLengthCompleted); + Base = (PVOID)((ULONG_PTR)Base + m_TransferBufferLengthCompleted); PC_ASSERT(m_EndpointDescriptor); PC_ASSERT(Base); // - // sanity check - // - ASSERT(m_EndpointDescriptor); - - // - // build bulk transfer descriptor chain - // - Status = BuildTransferDescriptorChain(QueueHead, - Base, - m_TransferBufferLength - m_TransferBufferLengthCompleted, - InternalGetPidDirection(), - m_EndpointDescriptor->DataToggle, - &FirstDescriptor, - &LastDescriptor, - &m_EndpointDescriptor->DataToggle, - &ChainDescriptorLength); - - // - // FIXME: handle errors - // - ASSERT(ChainDescriptorLength == m_TransferBufferLength); - - // - // move to next offset - // - m_TransferBufferLengthCompleted += ChainDescriptorLength; - - ASSERT(Status == STATUS_SUCCESS); - - // - // init queue head + // Get the offset from page size + // + PageOffset = BYTE_OFFSET(Base); + + // + // PageOffset should only be > 0 if this is the first transfer for this requests + // + if ((PageOffset != 0) && (m_TransferBufferLengthCompleted != 0)) + { + ASSERT(FALSE); + } + + // + // Calculate the size of this transfer + // + if ((PageOffset != 0) && ((m_TransferBufferLength - m_TransferBufferLengthCompleted) >= (PAGE_SIZE * 4) + PageOffset)) + { + CurrentTransferBufferLength = (PAGE_SIZE * 4) + PageOffset; + } + else if ((m_TransferBufferLength - m_TransferBufferLengthCompleted) >= PAGE_SIZE * 5) + { + CurrentTransferBufferLength = PAGE_SIZE * 5; + } + else + CurrentTransferBufferLength = (m_TransferBufferLength - m_TransferBufferLengthCompleted); + + // + // Add current transfer length to transfer length completed + // + m_TransferBufferLengthCompleted += CurrentTransferBufferLength; + BytesAvailable = CurrentTransferBufferLength; + + DPRINT1("BuildBulkTransferQueueHead\n"); + DPRINT("CurrentTransferBufferLength %x, m_TransferBufferLengthCompleted %x\n", CurrentTransferBufferLength, m_TransferBufferLengthCompleted); + + DPRINT("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); + DPRINT("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); + + DPRINT("Request %p Base Address %p TransferBytesLength %lu MDL %p\n", this, Base, BytesAvailable, m_TransferBufferMDL); + DPRINT("InternalGetPidDirection() %d EndPointAddress %x\n", InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F); + DPRINT("Irp %p QueueHead %p\n", m_Irp, QueueHead); + + //PC_ASSERT(InternalGetPidDirection() == USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); + + // + // DataToggle + // + DataToggle = FALSE; + + // + // Allocated transfer descriptors + // + for (Index = 0; Index < TransferDescriptorCount; Index++) + { + Status = CreateDescriptor(&m_TransferDescriptors[Index]); + if (!NT_SUCCESS(Status)) + { + // + // Failed to allocate transfer descriptors + // + + // + // Free QueueHead + // + FreeQueueHead(QueueHead); + + // + // Free Descriptors + // FIXME: Implement FreeDescriptors + // + return Status; + } + + // + // sanity check + // + PC_ASSERT(BytesAvailable); + + // + // now setup transfer buffers + // + for(BufferIndex = 0; BufferIndex < 5; BufferIndex++) + { + // + // If this is the first buffer of the first descriptor and there is a PageOffset + // + if ((BufferIndex == 0) && (PageOffset != 0) && (Index == 0)) + { + // + // use physical address + // + m_TransferDescriptors[Index]->BufferPointer[0] = MmGetPhysicalAddress(Base).LowPart; + + // + // move to next page + // + Base = (PVOID)ROUND_TO_PAGES(Base); + + // + // increment transfer bytes + // + if (CurrentTransferBufferLength > PAGE_SIZE - PageOffset) + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = PAGE_SIZE - PageOffset; + else + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = CurrentTransferBufferLength; + + // + // decrement available byte count + // + BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; + + DPRINT1("TransferDescriptor %p Index %lu BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], Index, m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + } + else + { + // + // the following pages always start on byte zero of each page + // + PC_ASSERT(((ULONG_PTR)Base & (PAGE_SIZE-1)) == 0); + + if (BytesAvailable >= PAGE_SIZE) + { + // + // store address + // + m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; + + // + // move to next page + // + Base = (PVOID)((ULONG_PTR)Base + PAGE_SIZE); + + // + // increment transfer descriptor bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += PAGE_SIZE; + + // + // decrement available byte count + // + BytesAvailable -= PAGE_SIZE; + + DPRINT1("TransferDescriptor %p Index %lu BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], Index, m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + } + else + { + PC_ASSERT(BytesAvailable); + + if (BytesAvailable) + { + // + // store address + // + m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; + + // + // increment transfer descriptor bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += BytesAvailable; + + // + // decrement available byte count + // + BytesAvailable -= BytesAvailable; + + // + // done as this is the last partial or full page + // + } + DPRINT1("TransferDescriptor %p Index %lu BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], Index, m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + + break; + } + } + + // + // Check if all bytes have been consumed + // + if (BytesAvailable == 0) + break; + } + + // + // Go ahead and link descriptors + // + if (Index > 0) + { + m_TransferDescriptors[Index - 1]->NextPointer = m_TransferDescriptors[Index]->PhysicalAddr; + } + + + // + // status descriptor + // + m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; + + // + // FIXME: need status descriptor? + // + + // + // setup direction + // + m_TransferDescriptors[Index]->Token.Bits.PIDCode = InternalGetPidDirection(); + + // + // set data toggle + // + m_TransferDescriptors[Index]->Token.Bits.DataToggle = DataToggle; + DataToggle = !DataToggle; + + // + // Check if all bytes have been consumed + // + if (BytesAvailable == 0) + break; + } + + // + // all bytes should have been consumed + // + PC_ASSERT(BytesAvailable == 0); + + // + // Initialize the QueueHead // QueueHead->EndPointCharacteristics.DeviceAddress = GetDeviceAddress(); - QueueHead->EndPointCharacteristics.EndPointNumber = m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0x0F; - QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; - QueueHead->NextPointer = FirstDescriptor->PhysicalAddr; - QueueHead->CurrentLinkPointer = FirstDescriptor->PhysicalAddr; - QueueHead->AlternateNextPointer = TERMINATE_POINTER; - - ASSERT(QueueHead->EndPointCharacteristics.DeviceAddress); - ASSERT(QueueHead->EndPointCharacteristics.EndPointNumber); - ASSERT(QueueHead->EndPointCharacteristics.MaximumPacketLength); - ASSERT(QueueHead->NextPointer); - - // - // interrupt on last descriptor - // - LastDescriptor->Token.Bits.InterruptOnComplete = TRUE; + + if (m_EndpointDescriptor) + { + // + // Set endpoint address and max packet length + // + QueueHead->EndPointCharacteristics.EndPointNumber = m_EndpointDescriptor->bEndpointAddress & 0x0F; + QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->wMaxPacketSize; + } + + // + // store number of transactions + // + QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = min(Index, 1); + + // + // link descriptor with queue head + // + QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; // // store result // *OutHead = QueueHead; - - // - // dump status - // - //DumpQueueHead(QueueHead); // // done @@ -1267,7 +1176,6 @@ QueueHead->HorizontalLinkPointer = TERMINATE_POINTER; QueueHead->AlternateNextPointer = TERMINATE_POINTER; QueueHead->NextPointer = TERMINATE_POINTER; - InitializeListHead(&QueueHead->TransferDescriptorListHead); // // 1 for non high speed, 0 for high speed device @@ -1628,42 +1536,61 @@ CUSBRequest::FreeQueueHead( IN struct _QUEUE_HEAD * QueueHead) { - PLIST_ENTRY Entry; - PQUEUE_TRANSFER_DESCRIPTOR Descriptor; - - // - // sanity checks - // - ASSERT(m_DmaManager); - ASSERT(QueueHead); - ASSERT(!IsListEmpty(&QueueHead->TransferDescriptorListHead)); - - do - { - // - // get transfer descriptors - // - Entry = RemoveHeadList(&QueueHead->TransferDescriptorListHead); - ASSERT(Entry); - - // - // obtain descriptor from entry - // - Descriptor = (PQUEUE_TRANSFER_DESCRIPTOR)CONTAINING_RECORD(Entry, QUEUE_TRANSFER_DESCRIPTOR, DescriptorEntry); - ASSERT(Descriptor); - - // - // add transfer count - // - m_TotalBytesTransferred += (Descriptor->TotalBytesToTransfer - Descriptor->Token.Bits.TotalBytesToTransfer); - DPRINT("TotalBytes Transferred in Descriptor %p Phys Addr %x TotalBytesSoftware %lu Length %lu\n", Descriptor, Descriptor->PhysicalAddr, Descriptor->TotalBytesToTransfer, Descriptor->TotalBytesToTransfer - Descriptor->Token.Bits.TotalBytesToTransfer); - - // - // release transfer descriptors - // - m_DmaManager->Release(Descriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); - - }while(!IsListEmpty(&QueueHead->TransferDescriptorListHead)); + LONG DescriptorCount; + + // + // FIXME: support chained queue heads + // + //PC_ASSERT(QueueHead == m_QueueHead); + + // + // release queue head + // + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + + // + // nullify pointer + // + m_QueueHead = 0; + + // + // release transfer descriptors + // + for (DescriptorCount = 0; DescriptorCount < 3; DescriptorCount++) + { + if (m_TransferDescriptors[DescriptorCount]) + { + // + // Calculate Total Bytes Transferred + // FIXME: Is this the correct method of determine bytes transferred? + // + if (USB_ENDPOINT_TYPE_BULK == GetTransferType()) + { + // + // sanity check + // + ASSERT(m_EndpointDescriptor); + + if (USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)) + { + DPRINT("m_TotalBytesTransferred %x, %x - %x\n", + m_TotalBytesTransferred, + m_TransferDescriptors[DescriptorCount]->TotalBytesToTransfer, + m_TransferDescriptors[DescriptorCount]->Token.Bits.TotalBytesToTransfer); + + m_TotalBytesTransferred += + m_TransferDescriptors[DescriptorCount]->TotalBytesToTransfer - + m_TransferDescriptors[DescriptorCount]->Token.Bits.TotalBytesToTransfer; + } + } + + // + // release transfer descriptors + // + m_DmaManager->Release(m_TransferDescriptors[DescriptorCount], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + m_TransferDescriptors[DescriptorCount] = 0; + } + } if (m_DescriptorPacket) { @@ -1671,18 +1598,8 @@ // release packet descriptor // m_DmaManager->Release(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - } - - // - // release queue head - // - m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); - - // - // nullify pointers - // - m_QueueHead = 0; - m_DescriptorPacket = 0; + m_DescriptorPacket = 0; + } } //----------------------------------------------------------------------------------------- @@ -1690,8 +1607,7 @@ CUSBRequest::IsQueueHeadComplete( struct _QUEUE_HEAD * QueueHead) { - PLIST_ENTRY Entry; - PQUEUE_TRANSFER_DESCRIPTOR Descriptor; + ULONG Index; // // first check - is the queue head currently active @@ -1701,50 +1617,39 @@ // // queue head is active (currently processed) // - return FALSE; - } - - if (QueueHead->Token.Bits.Halted) - { - // - // error occured - // - DPRINT1("Found halted queue head %p\n", QueueHead); - DumpQueueHead(QueueHead); - ASSERT(FALSE); - return TRUE; - } - - // - // loop list and see if there are any active descriptors - // - Entry = QueueHead->TransferDescriptorListHead.Flink; - while(Entry != &QueueHead->TransferDescriptorListHead) - { - // - // obtain descriptor from entry - // - Descriptor = (PQUEUE_TRANSFER_DESCRIPTOR)CONTAINING_RECORD(Entry, QUEUE_TRANSFER_DESCRIPTOR, DescriptorEntry); - ASSERT(Descriptor); - if (Descriptor->Token.Bits.Active) + ASSERT(QueueHead->Token.Bits.Halted == FALSE); + //return FALSE; + } + + // + // FIXME: support chained queue heads + // + for(Index = 0; Index < 3; Index++) + { + // + // check transfer descriptors for completion + // + if (m_TransferDescriptors[Index]) { // - // descriptor is still active - // - return FALSE; + // check for serious error + // + DPRINT("Descriptor Addr %x\n", m_TransferDescriptors[Index]->PhysicalAddr); + DPRINT("Descriptor BabbleDetected %x\n", m_TransferDescriptors[Index]->Token.Bits.BabbleDetected); + DPRINT("Descriptor DataBufferError %x\n", m_TransferDescriptors[Index]->Token.Bits.DataBufferError); + DPRINT("Descriptor DataToggle %x\n", m_TransferDescriptors[Index]->Token.Bits.DataToggle); + DPRINT("Descriptor ErrorCounter %x\n", m_TransferDescriptors[Index]->Token.Bits.ErrorCounter); + DPRINT("Descriptor TransactionError %x\n", m_TransferDescriptors[Index]->Token.Bits.TransactionError); + + + // + // the transfer descriptor should be in the same state as the queue head + // + //PC_ASSERT(m_TransferDescriptors[Index]->Token.Bits.Active == 0); } - - // - // move to next entry - // - Entry = Entry->Flink; - } - - DPRINT("QueueHead %p Addr %x is complete\n", QueueHead, QueueHead->PhysicalAddr); - - // - // no active descriptors found, queue head is finished - // + } + //ASSERT(FALSE); + return TRUE; } @@ -1777,7 +1682,8 @@ // sanity check // ASSERT(m_EndpointDescriptor); - if (USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress)) + + if (USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)) { // // bulk in request Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Thu Feb 9 19:11:13 2012 @@ -38,28 +38,6 @@ #define C_PORT_SUSPEND 18 #define C_PORT_OVER_CURRENT 19 #define C_PORT_RESET 20 - -typedef struct _USB_ENDPOINT -{ - USB_ENDPOINT_DESCRIPTOR EndPointDescriptor; - UCHAR HubAddress; - UCHAR HubPort; - UCHAR DataToggle; -} USB_ENDPOINT, *PUSB_ENDPOINT; - -typedef struct _USB_INTERFACE -{ - USB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - USB_ENDPOINT *EndPoints; -} USB_INTERFACE, *PUSB_INTERFACE; - -typedef struct _USB_CONFIGURATION -{ - USB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; - USB_INTERFACE *Interfaces; -} USB_CONFIGURATION, *PUSB_CONFIGURATION; - - typedef struct {

12 years, 10 months

[janderwald] 55515: [EHCI] - Try fix bulk transfers #1

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 9 16:06:34 2012 New Revision: 55515 URL: http://svn.reactos.org/svn/reactos?rev=55515&view=rev Log: [EHCI] - Try fix bulk transfers #1 Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.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 9 16:06:34 2012 @@ -32,6 +32,11 @@ NTAPI StatusChangeWorkItemRoutine(PVOID Context); +VOID +NTAPI +QueueHeadCompletionRoutine(PVOID Context); + + class CUSBHardwareDevice : public IUSBHardwareDevice { public: @@ -94,6 +99,7 @@ friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); friend VOID NTAPI EhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); friend VOID NTAPI StatusChangeWorkItemRoutine(PVOID Context); + friend VOID NTAPI QueueHeadCompletionRoutine(PVOID Context); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} virtual ~CUSBHardwareDevice(){} @@ -1306,6 +1312,37 @@ return TRUE; } +typedef struct +{ + WORK_QUEUE_ITEM QueueHeadWorkItem; + CUSBHardwareDevice * This; + +}QUEUE_HEAD_COMPLETION, *PQUEUE_HEAD_COMPLETION; + + +VOID +NTAPI +QueueHeadCompletionRoutine( + IN PVOID Ctx) +{ + // + // cast to hardware object + // + PQUEUE_HEAD_COMPLETION Context = (PQUEUE_HEAD_COMPLETION)Ctx; + + // + // now notify IUSBQueue that it can free completed requests + // + Context->This->m_UsbQueue->CompleteAsyncRequests(); + + // + // door ring bell completed + // + Context->This->m_DoorBellRingInProgress = FALSE; + + ExFreePool(Context); +} + VOID NTAPI EhciDefferedRoutine( IN PKDPC Dpc, @@ -1317,6 +1354,7 @@ ULONG CStatus, PortStatus, PortCount, i, ShouldRingDoorBell; NTSTATUS Status = STATUS_SUCCESS; EHCI_USBCMD_CONTENT UsbCmd; + PQUEUE_HEAD_COMPLETION Context; This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; @@ -1386,14 +1424,22 @@ PC_ASSERT(This->m_DoorBellRingInProgress == TRUE); // - // now notify IUSBQueue that it can free completed requests - // - This->m_UsbQueue->CompleteAsyncRequests(); - - // - // door ring bell completed - // - This->m_DoorBellRingInProgress = FALSE; + // get command register + // + This->GetCommandRegister(&UsbCmd); + ASSERT(UsbCmd.DoorBell == FALSE); + + // + // allocate work item context + // + Context = (PQUEUE_HEAD_COMPLETION)ExAllocatePool(NonPagedPool, sizeof(QUEUE_HEAD_COMPLETION)); + if (Context) + { + ExInitializeWorkItem(&Context->QueueHeadWorkItem, QueueHeadCompletionRoutine, Context); + Context->This = This; + ExQueueWorkItem(&Context->QueueHeadWorkItem, DelayedWorkQueue); + } + } This->GetDeviceDetails(NULL, NULL, &PortCount, NULL); 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 9 16:06:34 2012 @@ -220,6 +220,17 @@ PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; +C_ASSERT(sizeof(END_POINT_CHARACTERISTICS) == 4); +C_ASSERT(sizeof(END_POINT_CAPABILITIES) == 4); + +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, HorizontalLinkPointer) == 0x00); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, EndPointCharacteristics) == 0x04); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, EndPointCapabilities) == 0x08); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, CurrentLinkPointer) == 0xC); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, NextPointer) == 0x10); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, AlternateNextPointer) == 0x14); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, Token) == 0x18); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, BufferPointer) == 0x1C); C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, PhysicalAddr) == 0x30); Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Thu Feb 9 16:06:34 2012 @@ -626,6 +626,7 @@ // // walk async list // + ASSERT(AsyncListQueueHead); Entry = AsyncListQueueHead->LinkedQueueHeads.Flink; while(Entry != &AsyncListQueueHead->LinkedQueueHeads) @@ -634,6 +635,7 @@ // get queue head structure // QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + ASSERT(QueueHead); // // sanity check @@ -655,7 +657,7 @@ // IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead); - DPRINT1("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); + DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); // // check if queue head is complete Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Thu Feb 9 16:06:34 2012 @@ -141,6 +141,8 @@ NTSTATUS m_NtStatusCode; ULONG m_UrbStatusCode; + PVOID m_Base; + }; //---------------------------------------------------------------------------------------- @@ -660,8 +662,7 @@ // // Get the offset from page size // - PageOffset = BYTE_OFFSET(TransferBuffer); - + PageOffset = BYTE_OFFSET(CurrentDescriptor->BufferPointer[Index]); if (PageOffset != 0) { // @@ -688,7 +689,7 @@ CurrentDescriptor->Token.Bits.TotalBytesToTransfer += BufferLength; CurrentDescriptor->TotalBytesToTransfer += BufferLength; Length += BufferLength; - DPRINT1("Index %lu Length %lu Buffer %p\n", Index, Length, TransferBuffer); + DPRINT("Index %lu TransferBufferLength %lu PageOffset %x BufferLength %lu Buffer Phy %p TransferBuffer %p\n", Index, TransferBufferLength, PageOffset, BufferLength, CurrentDescriptor->BufferPointer[Index], TransferBuffer); // // decrement available byte count @@ -757,7 +758,6 @@ return Status; } - DPRINT1("BuildTransferDescriptorChain TransferBufferLength %lu TransferBufferOffset %lu\n", TransferBufferLength, TransferBufferOffset); // // now init the descriptor // @@ -785,6 +785,7 @@ // LastDescriptor->AlternateNextPointer = CurrentDescriptor->PhysicalAddr; LastDescriptor->NextPointer = CurrentDescriptor->PhysicalAddr; + LastDescriptor = CurrentDescriptor; } else { @@ -794,11 +795,6 @@ LastDescriptor = FirstDescriptor = CurrentDescriptor; } - // - // flip data toggle - // - InitialDataToggle = !InitialDataToggle; - if(TransferBufferLength == TransferBufferOffset) { // @@ -806,7 +802,6 @@ // break; } - break; }while(TRUE); if (OutFirstDescriptor) @@ -827,6 +822,11 @@ if (OutDataToggle) { + // + // flip data toggle + // + InitialDataToggle = !InitialDataToggle; + // // store result data toggle // @@ -1090,303 +1090,6 @@ CUSBRequest::BuildBulkTransferQueueHead( PQUEUE_HEAD * OutHead) { -#if 0 - NTSTATUS Status; - PQUEUE_HEAD QueueHead; - ULONG TransferDescriptorCount, Index; - ULONG BytesAvailable, BufferIndex; - PVOID Base; - ULONG PageOffset, CurrentTransferBufferLength; - PQUEUE_TRANSFER_DESCRIPTOR m_TransferDescriptors[3]; - - // - // Allocate the queue head - // - Status = CreateQueueHead(&QueueHead); - - if (!NT_SUCCESS(Status)) - { - // - // failed to allocate queue heads - // - return STATUS_INSUFFICIENT_RESOURCES; - } - - // - // sanity checks - // - PC_ASSERT(QueueHead); - PC_ASSERT(m_TransferBufferLength); - - // - // Max default of 3 descriptors - // - TransferDescriptorCount = 3; - - // - // get virtual base of mdl - // - Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); - - // - // Increase the size of last transfer, 0 in case this is the first - // - Base = (PVOID)((ULONG_PTR)Base + m_TransferBufferLengthCompleted); - - PC_ASSERT(m_EndpointDescriptor); - PC_ASSERT(Base); - - // - // Get the offset from page size - // - PageOffset = BYTE_OFFSET(Base); - - // - // PageOffset should only be > 0 if this is the first transfer for this requests - // - if ((PageOffset != 0) && (m_TransferBufferLengthCompleted != 0)) - { - ASSERT(FALSE); - } - - // - // Calculate the size of this transfer - // - if ((PageOffset != 0) && ((m_TransferBufferLength - m_TransferBufferLengthCompleted) >= (PAGE_SIZE * 4) + PageOffset)) - { - CurrentTransferBufferLength = (PAGE_SIZE * 4) + PageOffset; - } - else if ((m_TransferBufferLength - m_TransferBufferLengthCompleted) >= PAGE_SIZE * 5) - { - CurrentTransferBufferLength = PAGE_SIZE * 5; - } - else - CurrentTransferBufferLength = (m_TransferBufferLength - m_TransferBufferLengthCompleted); - - // - // Add current transfer length to transfer length completed - // - m_TransferBufferLengthCompleted += CurrentTransferBufferLength; - BytesAvailable = CurrentTransferBufferLength; - DPRINT("CurrentTransferBufferLength %x, m_TransferBufferLengthCompleted %x\n", CurrentTransferBufferLength, m_TransferBufferLengthCompleted); - - DPRINT("EndPointAddress %x\n", m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress); - DPRINT("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress)); - - DPRINT("Request %p Base Address %p TransferBytesLength %lu MDL %p\n", this, Base, BytesAvailable, m_TransferBufferMDL); - DPRINT("InternalGetPidDirection() %d EndPointAddress %x\n", InternalGetPidDirection(), m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0x0F); - DPRINT("Irp %p QueueHead %p\n", m_Irp, QueueHead); - - //PC_ASSERT(InternalGetPidDirection() == USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); - - // - // Allocated transfer descriptors - // - for (Index = 0; Index < TransferDescriptorCount; Index++) - { - Status = CreateDescriptor(&m_TransferDescriptors[Index]); - if (!NT_SUCCESS(Status)) - { - // - // Failed to allocate transfer descriptors - // - - // - // Free QueueHead - // - FreeQueueHead(QueueHead); - - // - // Free Descriptors - // FIXME: Implement FreeDescriptors - // - return Status; - } - - // - // sanity check - // - PC_ASSERT(BytesAvailable); - - // - // now setup transfer buffers - // - for(BufferIndex = 0; BufferIndex < 5; BufferIndex++) - { - // - // If this is the first buffer of the first descriptor and there is a PageOffset - // - if ((BufferIndex == 0) && (PageOffset != 0) && (Index == 0)) - { - // - // use physical address - // - m_TransferDescriptors[Index]->BufferPointer[0] = MmGetPhysicalAddress(Base).LowPart; - - // - // move to next page - // - Base = (PVOID)ROUND_TO_PAGES(Base); - - // - // increment transfer bytes - // - if (CurrentTransferBufferLength > PAGE_SIZE - PageOffset) - m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = PAGE_SIZE - PageOffset; - else - m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = CurrentTransferBufferLength; - - // - // decrement available byte count - // - BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; - - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], - BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); - } - else - { - // - // the following pages always start on byte zero of each page - // - PC_ASSERT(((ULONG_PTR)Base & (PAGE_SIZE-1)) == 0); - - if (BytesAvailable >= PAGE_SIZE) - { - // - // store address - // - m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; - - // - // move to next page - // - Base = (PVOID)((ULONG_PTR)Base + PAGE_SIZE); - - // - // increment transfer descriptor bytes - // - m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += PAGE_SIZE; - - // - // decrement available byte count - // - BytesAvailable -= PAGE_SIZE; - - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], - BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); - } - else - { - PC_ASSERT(BytesAvailable); - - // - // store address - // - m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; - - // - // increment transfer descriptor bytes - // - m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += BytesAvailable; - - // - // decrement available byte count - // - BytesAvailable -= BytesAvailable; - - // - // done as this is the last partial or full page - // - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], - BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); - - break; - } - } - - // - // Check if all bytes have been consumed - // - if (BytesAvailable == 0) - break; - } - - // - // store transfer bytes of descriptor - // - m_TransferDescriptors[Index]->TotalBytesToTransfer = m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; - - // - // Go ahead and link descriptors - // - if (Index > 0) - { - m_TransferDescriptors[Index - 1]->NextPointer = m_TransferDescriptors[Index]->PhysicalAddr; - } - - // - // setup direction - // - m_TransferDescriptors[Index]->Token.Bits.PIDCode = InternalGetPidDirection(); - - // - // FIXME: performance penality? - // - m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; - - InsertTailList(&QueueHead->TransferDescriptorListHead, &m_TransferDescriptors[Index]->DescriptorEntry); - - m_TransferDescriptors[Index]->Token.Bits.DataToggle = m_EndpointDescriptor->DataToggle; - m_EndpointDescriptor->DataToggle = !m_EndpointDescriptor->DataToggle; - - // - // FIXME need dead queue transfer descriptor? - // - - // - // Check if all bytes have been consumed - // - if (BytesAvailable == 0) - break; - } - - // - // all bytes should have been consumed - // - PC_ASSERT(BytesAvailable == 0); - - // - // Initialize the QueueHead - // - QueueHead->EndPointCharacteristics.DeviceAddress = GetDeviceAddress(); - - if (m_EndpointDescriptor) - { - // - // Set endpoint address and max packet length - // - QueueHead->EndPointCharacteristics.EndPointNumber = m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0x0F; - QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; - } - - QueueHead->Token.Bits.DataToggle = TRUE; - - // - // link descriptor with queue head - // - QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; - - // - // store result - // - *OutHead = QueueHead; - - // - // done - // - return STATUS_SUCCESS; -#else NTSTATUS Status; PQUEUE_HEAD QueueHead; PVOID Base; @@ -1412,15 +1115,18 @@ PC_ASSERT(QueueHead); PC_ASSERT(m_TransferBufferLength); - // - // get virtual base of mdl - // - Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); + if (!m_Base) + { + // + // get virtual base of mdl + // + m_Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); + } // // Increase the size of last transfer, 0 in case this is the first // - Base = (PVOID)((ULONG_PTR)Base + m_TransferBufferLengthCompleted); + Base = (PVOID)((ULONG_PTR)m_Base + m_TransferBufferLengthCompleted); PC_ASSERT(m_EndpointDescriptor); PC_ASSERT(Base); @@ -1429,8 +1135,6 @@ // sanity check // ASSERT(m_EndpointDescriptor); - - DPRINT1("Before EndPoint %p DataToggle %x\n", m_EndpointDescriptor, m_EndpointDescriptor->DataToggle); // // build bulk transfer descriptor chain @@ -1448,14 +1152,12 @@ // // FIXME: handle errors // - //ASSERT(ChainDescriptorLength == m_TransferBufferLength); - DPRINT1("Afterwards: EndPoint %p DataToggle %x\n", m_EndpointDescriptor, m_EndpointDescriptor->DataToggle); + ASSERT(ChainDescriptorLength == m_TransferBufferLength); // // move to next offset // m_TransferBufferLengthCompleted += ChainDescriptorLength; - ASSERT(Status == STATUS_SUCCESS); @@ -1466,7 +1168,8 @@ QueueHead->EndPointCharacteristics.EndPointNumber = m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0x0F; QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; QueueHead->NextPointer = FirstDescriptor->PhysicalAddr; - + QueueHead->CurrentLinkPointer = FirstDescriptor->PhysicalAddr; + QueueHead->AlternateNextPointer = TERMINATE_POINTER; ASSERT(QueueHead->EndPointCharacteristics.DeviceAddress); ASSERT(QueueHead->EndPointCharacteristics.EndPointNumber); @@ -1486,13 +1189,12 @@ // // dump status // - DumpQueueHead(QueueHead); + //DumpQueueHead(QueueHead); // // done // return STATUS_SUCCESS; -#endif } //---------------------------------------------------------------------------------------- @@ -1929,6 +1631,13 @@ PLIST_ENTRY Entry; PQUEUE_TRANSFER_DESCRIPTOR Descriptor; + // + // sanity checks + // + ASSERT(m_DmaManager); + ASSERT(QueueHead); + ASSERT(!IsListEmpty(&QueueHead->TransferDescriptorListHead)); + do { // @@ -1941,12 +1650,13 @@ // obtain descriptor from entry // Descriptor = (PQUEUE_TRANSFER_DESCRIPTOR)CONTAINING_RECORD(Entry, QUEUE_TRANSFER_DESCRIPTOR, DescriptorEntry); + ASSERT(Descriptor); // // add transfer count // m_TotalBytesTransferred += (Descriptor->TotalBytesToTransfer - Descriptor->Token.Bits.TotalBytesToTransfer); - DPRINT1("TotalBytes Transferred in Descriptor %p Length %lu\n", Descriptor, Descriptor->TotalBytesToTransfer - Descriptor->Token.Bits.TotalBytesToTransfer); + DPRINT("TotalBytes Transferred in Descriptor %p Phys Addr %x TotalBytesSoftware %lu Length %lu\n", Descriptor, Descriptor->PhysicalAddr, Descriptor->TotalBytesToTransfer, Descriptor->TotalBytesToTransfer - Descriptor->Token.Bits.TotalBytesToTransfer); // // release transfer descriptors @@ -2015,6 +1725,7 @@ // obtain descriptor from entry // Descriptor = (PQUEUE_TRANSFER_DESCRIPTOR)CONTAINING_RECORD(Entry, QUEUE_TRANSFER_DESCRIPTOR, DescriptorEntry); + ASSERT(Descriptor); if (Descriptor->Token.Bits.Active) { // @@ -2028,6 +1739,8 @@ // Entry = Entry->Flink; } + + DPRINT("QueueHead %p Addr %x is complete\n", QueueHead, QueueHead->PhysicalAddr); // // no active descriptors found, queue head is finished

12 years, 10 months

[janderwald] 55514: [USBHUB] - Ignore error when the device provides a string descriptor but no contents - Fixes installation of cheap usb devices

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 9 15:33:09 2012 New Revision: 55514 URL: http://svn.reactos.org/svn/reactos?rev=55514&view=rev Log: [USBHUB] - Ignore error when the device provides a string descriptor but no contents - Fixes installation of cheap usb devices 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] Thu Feb 9 15:33:09 2012 @@ -1056,11 +1056,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - return Status; - } - - UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; - DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); + RtlInitUnicodeString(&UsbChildExtension->usTextDescription, ""); + } + else + { + UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; + DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); + } } //

12 years, 10 months

[tkreuzer] 55513: [NTOSKRNL] Use MiNonPagedSystemSize when creating the system NP memory area instead of making assumptions about the memory layout Finally the amd64 port boots into usermode and us...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 9 12:04:31 2012 New Revision: 55513 URL: http://svn.reactos.org/svn/reactos?rev=55513&view=rev Log: [NTOSKRNL] Use MiNonPagedSystemSize when creating the system NP memory area instead of making assumptions about the memory layout Finally the amd64 port boots into usermode and usetup is partly working, formats the harddisk but freezes, when copying files. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Feb 9 12:04:31 2012 @@ -126,8 +126,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - (ULONG_PTR)MmNonPagedPoolEnd - - (ULONG_PTR)MmNonPagedSystemStart, + MiNonPagedSystemSize, PAGE_READWRITE, &MArea, TRUE,

12 years, 10 months

[tkreuzer] 55512: {RTL] - Fix RtlLengthSecurityDescriptor - Fix pointer calculation in amd64 interlocked slist code - Assert that the slist entry pointer is 16 byte aligned [CRT] - Add amd64 stubs ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 9 11:54:59 2012 New Revision: 55512 URL: http://svn.reactos.org/svn/reactos?rev=55512&view=rev Log: {RTL] - Fix RtlLengthSecurityDescriptor - Fix pointer calculation in amd64 interlocked slist code - Assert that the slist entry pointer is 16 byte aligned [CRT] - Add amd64 stubs for acos and acosf Added: trunk/reactos/lib/sdk/crt/math/amd64/acos.S (with props) trunk/reactos/lib/sdk/crt/math/amd64/acosf.S (with props) Modified: trunk/reactos/lib/rtl/amd64/slist.S trunk/reactos/lib/rtl/sd.c trunk/reactos/lib/sdk/crt/crt.cmake Modified: trunk/reactos/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/slist.S?rev=… ============================================================================== --- trunk/reactos/lib/rtl/amd64/slist.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/slist.S [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -18,7 +18,7 @@ #define SLIST8B_HEADERTYPE_MASK HEX(0000000000000001) #define SLIST8B_INIT_MASK HEX(0000000000000002) #define SLIST8B_REGION_MASK HEX(E000000000000000) -#define SLIST8_POINTER_MASK HEX(000007FFFFFFFFF0) +#define SLIST8_POINTER_MASK HEX(000007FFFFFFFFFF) #define SLIST16A_DEPTH_MASK HEX(000000000000FFFF) #define SLIST16A_DEPTH_INC HEX(0000000000000001) @@ -181,6 +181,15 @@ RtlInterlockedPushEntrySList: ExpInterlockedPushEntrySList: +#if DBG + /* Make sure the ListEntry is 16 bytes aligned */ + test rdx, HEX(0F) + jz ExpInterlockedPushEntrySListChecked + /* Not aligned, raise an assertion */ + int HEX(2C) +ExpInterlockedPushEntrySListChecked: +#endif + /* Load ListHead->Alignment into rax */ mov rax, [rcx] @@ -301,7 +310,7 @@ RtlInterlockedFlushSListLoop: - /* Zero ListHead->Alignment */ + /* Zero ListHead->Alignment */ xor r8, r8 /* If [rcx] equals rax, exchange it with r8 */ Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=55512&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -250,9 +250,14 @@ { PSID Owner, Group; PACL Sacl, Dacl; - ULONG Length = sizeof(SECURITY_DESCRIPTOR); - - PAGED_CODE_RTL(); + ULONG Length; + + PAGED_CODE_RTL(); + + if (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Control & SE_SELF_RELATIVE) + Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + else + Length = sizeof(SECURITY_DESCRIPTOR); RtlpQuerySecurityDescriptorPointers((PISECURITY_DESCRIPTOR)SecurityDescriptor, &Owner, Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -392,6 +392,8 @@ float/amd64/fpreset.S float/amd64/logb.S float/i386/statfp.c + math/amd64/acos.S + math/amd64/acosf.S math/amd64/atan.S math/amd64/atan2.S math/amd64/ceil.S Added: trunk/reactos/lib/sdk/crt/math/amd64/acos.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/aco… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/acos.S (added) +++ trunk/reactos/lib/sdk/crt/math/amd64/acos.S [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -1,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of acos + * FILE: lib/sdk/crt/math/amd64/acos.S + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +/* CODE **********************************************************************/ +.code64 + +PUBLIC acos +acos: + UNIMPLEMENTED acos + ret + +END Propchange: trunk/reactos/lib/sdk/crt/math/amd64/acos.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/amd64/acosf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/aco… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/acosf.S (added) +++ trunk/reactos/lib/sdk/crt/math/amd64/acosf.S [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -1,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of acosf + * FILE: lib/sdk/crt/math/amd64/acosf.S + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +/* CODE **********************************************************************/ +.code64 + +PUBLIC acosf +acosf: + UNIMPLEMENTED acos + ret + +END Propchange: trunk/reactos/lib/sdk/crt/math/amd64/acosf.S ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 10 months

[tkreuzer] 55511: [USB] Don't compile nt4 compat driver for amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 9 11:51:21 2012 New Revision: 55511 URL: http://svn.reactos.org/svn/reactos?rev=55511&view=rev Log: [USB] Don't compile nt4 compat driver for amd64 Modified: trunk/reactos/drivers/usb/CMakeLists.txt Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Feb 9 11:51:21 2012 @@ -1,5 +1,7 @@ -add_subdirectory(nt4compat) +if(NOT ${ARCH} MATCHES amd64) + add_subdirectory(nt4compat) +endif() add_subdirectory(usbd) #add_subdirectory(usbehci) The USB branch has usbehci_new #add_subdirectory(usbhub) Compiles, just skipped in trunk

12 years, 10 months

[tkreuzer] 55510: [CLASS2] Fix 64 bit warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 9 11:34:21 2012 New Revision: 55510 URL: http://svn.reactos.org/svn/reactos?rev=55510&view=rev Log: [CLASS2] Fix 64 bit warnings Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Thu Feb 9 11:34:21 2012 @@ -1510,7 +1510,7 @@ srb, irpStack->MajorFunction, irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0, - MAXIMUM_RETRIES - ((ULONG_PTR)irpStack->Parameters.Others.Argument4), + MAXIMUM_RETRIES - PtrToUlong(irpStack->Parameters.Others.Argument4), &status); // @@ -1662,7 +1662,7 @@ srb, irpStack->MajorFunction, irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0, - MAXIMUM_RETRIES - ((ULONG_PTR)irpStack->Parameters.Others.Argument4), + MAXIMUM_RETRIES - PtrToUlong(irpStack->Parameters.Others.Argument4), &status); //

12 years, 10 months

[ion] 55509: [SMSS2]: Implement SmpCallCsrCreateProcess and SmpLoadSubsystem. We now load CSRSS and everything works 100%! Winlogon is now launched by SMSS2 and no regressions have been found. [SMS...

by ion＠svn.reactos.org

Author: ion Date: Thu Feb 9 02:21:56 2012 New Revision: 55509 URL: http://svn.reactos.org/svn/reactos?rev=55509&view=rev Log: [SMSS2]: Implement SmpCallCsrCreateProcess and SmpLoadSubsystem. We now load CSRSS and everything works 100%! Winlogon is now launched by SMSS2 and no regressions have been found. [SMSS]: Turn off all code other than setting up the pagefile. There's a lot of debug prints, as soon as things seem stable after a few days, SMSS will be gone and SMSS2 will take over and DPRINT1s will mostly be gone. Modified: trunk/reactos/base/system/smss/init.c trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/smss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/init.c?re… ============================================================================== --- trunk/reactos/base/system/smss/init.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/init.c [iso-8859-1] Thu Feb 9 02:21:56 2012 @@ -24,8 +24,8 @@ } InitRoutine [] = { {TRUE, SmCreateHeap, "create private heap, aborting"}, // {TRUE, SmCreateObjectDirectories, "create object directories"}, - {TRUE, SmCreateApiPort, "create \\SmApiPort"}, - {TRUE, SmCreateEnvironment, "create the system environment"}, +// {TRUE, SmCreateApiPort, "create \\SmApiPort"}, +// {TRUE, SmCreateEnvironment, "create the system environment"}, // {TRUE, SmSetEnvironmentVariables, "set system environment variables"}, // {TRUE, SmInitDosDevices, "create dos device links"}, // {TRUE, SmRunBootApplications, "run boot applications"}, @@ -34,8 +34,8 @@ // {FALSE, SmLoadKnownDlls, "preload system DLLs"}, {TRUE, SmCreatePagingFiles, "create paging files"}, // {TRUE, SmInitializeRegistry, "initialize the registry"}, - {TRUE, SmInitializeClientManagement, "initialize client management"}, - {TRUE, SmLoadSubsystems, "load subsystems"} +// {TRUE, SmInitializeClientManagement, "initialize client management"}, +// {TRUE, SmLoadSubsystems, "load subsystems"} }; NTSTATUS Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Thu Feb 9 02:21:56 2012 @@ -23,6 +23,24 @@ /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +SmpCallCsrCreateProcess(IN PSB_API_MSG SbApiMsg, + IN USHORT MessageLength, + IN HANDLE PortHandle) +{ + NTSTATUS Status; + + /* Initialize the header and send the message to CSRSS */ + SbApiMsg->h.u2.ZeroInit = 0; + SbApiMsg->h.u1.s1.DataLength = MessageLength + 8; + SbApiMsg->h.u1.s1.TotalLength = sizeof(SB_API_MSG); + SbApiMsg->ApiNumber = SbpCreateProcess; + Status = NtRequestWaitReplyPort(PortHandle, &SbApiMsg->h, &SbApiMsg->h); + if (NT_SUCCESS(Status)) Status = SbApiMsg->ReturnValue; + return Status; +} + VOID NTAPI SmpDereferenceSubsystem(IN PSMP_SUBSYSTEM SubSystem) @@ -60,7 +78,7 @@ { /* Check if this one matches the client ID and is still valid */ Subsystem = CONTAINING_RECORD(NextEntry, SMP_SUBSYSTEM, Entry); - if ((*(PULONGLONG)&Subsystem->ClientId == *(PULONGLONG)&ClientId) && + if ((*(PULONGLONG)&Subsystem->ClientId == *(PULONGLONG)ClientId) && !(Subsystem->Terminating)) { /* Add a reference and return it */ @@ -123,8 +141,378 @@ OUT PHANDLE ProcessId, IN ULONG Flags) { - DPRINT1("Should start subsystem %wZ for Session: %lx\n", FileName, MuSessionId); - return STATUS_SUCCESS; + PSMP_SUBSYSTEM Subsystem, NewSubsystem, KnownSubsystem = NULL; + HANDLE SubSysProcessId; + NTSTATUS Status = STATUS_SUCCESS; + SB_API_MSG SbApiMsg, SbApiMsg2; + RTL_USER_PROCESS_INFORMATION ProcessInformation; + LARGE_INTEGER Timeout; + PVOID State; + PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.CreateProcess; + PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.CreateSession; + DPRINT1("Loading subsystem: %wZ\n", FileName); + + /* Make sure this is a found subsystem */ + if (Flags & SMP_INVALID_PATH) + { + DPRINT1("SMSS: Unable to find subsystem - %wZ\n", FileName); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Don't use a session if the flag is set */ + if (Flags & 0x80) MuSessionId = 0; + + /* Lock the subsystems while we do a look up */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + while (TRUE) + { + /* Check if we found a subsystem not yet fully iniitalized */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, -1); + if (!Subsystem) break; + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + + /* Wait on it to initialize */ + NtWaitForSingleObject(Subsystem->Event, FALSE, NULL); + + /* Dereference it and try the next one */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + SmpDereferenceSubsystem(Subsystem); + } + + /* Check if this is a POSIX subsystem */ + if (Flags & SMP_POSIX_FLAG) + { + /* Do we already have it? */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, IMAGE_SUBSYSTEM_POSIX_CUI); + } + else if (Flags & SMP_OS2_FLAG) + { + /* This is an OS/2 subsystem, do we we already have it? */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, IMAGE_SUBSYSTEM_OS2_CUI); + } + + /* Check if we already have one of the optional subsystems for the session */ + if (Subsystem) + { + /* Dereference and return, no work to do */ + SmpDereferenceSubsystem(Subsystem); + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return STATUS_SUCCESS; + } + + /* Allocate a new subsystem! */ + NewSubsystem = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_SUBSYSTEM)); + DPRINT1("new subsystem created: %p\n", NewSubsystem); + if (!NewSubsystem) + { + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return STATUS_NO_MEMORY; + } + + /* Initialize its header and reference count */ + NewSubsystem->ReferenceCount = 1; + NewSubsystem->MuSessionId = MuSessionId; + NewSubsystem->ImageType = -1; + + /* Clear out all the other data for now */ + NewSubsystem->Terminating = FALSE; + NewSubsystem->ProcessHandle = NULL; + NewSubsystem->Event = NULL; + NewSubsystem->PortHandle = NULL; + NewSubsystem->SbApiPort = NULL; + + /* Create the event we'll be wating on for initialization */ + Status = NtCreateEvent(&NewSubsystem->Event, + EVENT_ALL_ACCESS, + NULL, + NotificationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + /* This failed, bail out */ + RtlFreeHeap(SmpHeap, 0, NewSubsystem); + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return STATUS_NO_MEMORY; + } + + /* Insert the subsystem and release the lock. It can now be found */ + InsertTailList(&SmpKnownSubSysHead, &NewSubsystem->Entry); + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + + /* The OS/2 and POSIX subsystems are actually Windows applications! */ + if (Flags & (SMP_POSIX_FLAG | SMP_OS2_FLAG)) + { + /* Locate the Windows subsystem for this session */ + KnownSubsystem = SmpLocateKnownSubSysByType(MuSessionId, + IMAGE_SUBSYSTEM_WINDOWS_GUI); + if (!KnownSubsystem) + { + DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed\n"); + goto Quickie2; + } + + /* Fill out all the process details and call CSRSS to launch it */ + CreateProcess->In.ImageName = FileName; + CreateProcess->In.CurrentDirectory = Directory; + CreateProcess->In.CommandLine = CommandLine; + CreateProcess->In.DllPath = SmpDefaultLibPath.Length ? + &SmpDefaultLibPath : NULL; + CreateProcess->In.Flags = Flags | SMP_DEFERRED_FLAG; + CreateProcess->In.DebugFlags = SmpDebug; + Status = SmpCallCsrCreateProcess(&SbApiMsg, + sizeof(*CreateProcess), + KnownSubsystem->SbApiPort); + if (!NT_SUCCESS(Status)) + { + /* Handle failures */ + DPRINT1("SMSS: SmpLoadSubSystem - SmpCallCsrCreateProcess Failed with Status %lx\n", + Status); + goto Quickie2; + } + + /* Save the process information we'll need for the create session */ + ProcessInformation.ProcessHandle = CreateProcess->Out.ProcessHandle; + ProcessInformation.ThreadHandle = CreateProcess->Out.ThreadHandle; + ProcessInformation.ClientId = CreateProcess->Out.ClientId; + ProcessInformation.ImageInformation.SubSystemType = CreateProcess->Out.SubsystemType; + } + else + { + /* This must be CSRSS itself, so just launch it and that's it */ + DPRINT1("Executing CSRSS\n"); + Status = SmpExecuteImage(FileName, + Directory, + CommandLine, + MuSessionId, + Flags | SMP_DEFERRED_FLAG, + &ProcessInformation); + if (!NT_SUCCESS(Status)) + { + /* Handle failures */ + DPRINT1("SMSS: SmpLoadSubSystem - SmpExecuteImage Failed with Status %lx\n", + Status); + goto Quickie2; + } + } + + /* Fill out the handle and client ID in the subsystem structure now */ + NewSubsystem->ProcessHandle = ProcessInformation.ProcessHandle; + NewSubsystem->ClientId = ProcessInformation.ClientId; + + /* Check if we launched a native image or a subsystem-backed image */ + if (ProcessInformation.ImageInformation.SubSystemType == IMAGE_SUBSYSTEM_NATIVE) + { + /* This must be CSRSS itself, since it's a native subsystem image */ + SubSysProcessId = ProcessInformation.ClientId.UniqueProcess; + if ((ProcessId) && !(*ProcessId)) *ProcessId = SubSysProcessId; + + /* Was this the initial CSRSS on Session 0? */ + if (!MuSessionId) + { + /* Then save it in the global variables */ + SmpWindowsSubSysProcessId = SubSysProcessId; + SmpWindowsSubSysProcess = ProcessInformation.ProcessHandle; + } + ASSERT(NT_SUCCESS(Status)); + DPRINT1("CSRSS is up and running: %lx %lx\n", SmpWindowsSubSysProcessId, SmpWindowsSubSysProcess); + } + else + { + /* This is the POSIX or OS/2 subsystem process, copy its information */ + RtlCopyMemory(&CreateSession->ProcessInfo, + &ProcessInformation, + sizeof(&CreateSession->ProcessInfo)); + + /* Not sure these field mean what I think they do -- but clear them */ + *(PULONGLONG)&CreateSession->ClientId = 0; + CreateSession->MuSessionId = 0; + + /* This should find CSRSS because they are POSIX or OS/2 subsystems */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, + ProcessInformation.ImageInformation.SubSystemType); + if (!Subsystem) + { + /* Odd failure -- but handle it anyway */ + Status = STATUS_NO_SUCH_PACKAGE; + DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + + /* Duplicate the parent process handle for the subsystem to have */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation.ProcessHandle, + Subsystem->ProcessHandle, + &CreateSession->ProcessInfo.ProcessHandle, + PROCESS_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail since this is critical */ + DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + + /* Duplicate the initial thread handle for the subsystem to have */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation.ThreadHandle, + Subsystem->ProcessHandle, + &CreateSession->ProcessInfo.ThreadHandle, + THREAD_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail since this is critical */ + DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + + /* Allocate an internal Session ID for this subsystem */ + MuSessionId = SmpAllocateSessionId(Subsystem, 0); + CreateSession->SessionId = MuSessionId; + + /* Send the create session message to the subsystem */ + SbApiMsg2.ReturnValue = STATUS_SUCCESS; + SbApiMsg2.h.u2.ZeroInit = 0; + SbApiMsg2.h.u1.s1.DataLength = sizeof(SB_CREATE_SESSION_MSG) + 8; + SbApiMsg2.h.u1.s1.TotalLength = sizeof(SB_API_MSG); + Status = NtRequestWaitReplyPort(Subsystem->SbApiPort, + &SbApiMsg2.h, + &SbApiMsg2.h); + if (NT_SUCCESS(Status)) Status = SbApiMsg2.ReturnValue; + if (!NT_SUCCESS(Status)) + { + /* Delete the session and handle failure if the LPC call failed */ + SmpDeleteSession(CreateSession->SessionId); + DPRINT1("SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with Status %lx for sessionid %ld\n", + Status, + CreateSession->SessionId); + goto Quickie; + } + } + + /* Okay, everything looks good to go, initialize this subsystem now! */ + DPRINT1("Resuming the subsystem!\n"); + Status = NtResumeThread(ProcessInformation.ThreadHandle, NULL); + if (!NT_SUCCESS(Status)) + { + /* That didn't work -- back out of everything */ + DPRINT1("SMSS: SmpLoadSubSystem - NtResumeThread failed Status %lx\n", Status); + goto Quickie; + } + + /* Check if this was the subsystem for a different session */ + if (MuSessionId) + { + /* Wait up to 60 seconds for it to initialize */ + Timeout.QuadPart = -600000000; + Status = NtWaitForSingleObject(NewSubsystem->Event, FALSE, &Timeout); + + /* Timeout is done -- does this session still exist? */ + if (!SmpCheckDuplicateMuSessionId(MuSessionId)) + { + /* Nope, it died. Cleanup should've ocurred in a different path. */ + DPRINT1("SMSS: SmpLoadSubSystem - session deleted\n"); + return STATUS_DELETE_PENDING; + } + + /* Check if we timed our or there was another error with the wait */ + if (Status != STATUS_WAIT_0) + { + /* Something is wrong with the subsystem, so back out of everything */ + DPRINT1("SMSS: SmpLoadSubSystem - Timeout waiting for subsystem connect with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + } + else + { + /* This a session 0 subsystem, just wait for it to initialize */ + DPRINT1("Waiting on the subsystem to initialize...\n"); + NtWaitForSingleObject(NewSubsystem->Event, FALSE, NULL); + DPRINT1("Subsystem is ready!!!\n"); + } + + /* Subsystem is created, resumed, and initialized. Close handles and exit */ + NtClose(ProcessInformation.ThreadHandle); + Status = STATUS_SUCCESS; + DPRINT1("Returning success\n"); + goto Quickie2; + +Quickie: + /* This is the failure path. First check if we need to detach from session */ + if ((AttachedSessionId == -1) || (Flags & (SMP_POSIX_FLAG | SMP_OS2_FLAG))) + { + /* We were not attached, or did not launch subsystems that required it */ + DPRINT1("SMSS: Did not detach from Session Space: SessionId=%x Flags=%x Status=%x\n", + AttachedSessionId, + Flags | SMP_DEFERRED_FLAG, + Status); + } + else + { + /* Get the privilege we need for detachment */ + Status = SmpAcquirePrivilege(SE_LOAD_DRIVER_PRIVILEGE, &State); + if (!NT_SUCCESS(Status)) + { + /* We can't detach without it */ + DPRINT1("SMSS: Did not detach from Session Space: SessionId=%x Flags=%x Status=%x\n", + AttachedSessionId, + Flags | SMP_DEFERRED_FLAG, + Status); + } + else + { + /* Now detach from the session */ + Status = NtSetSystemInformation(SystemSessionDetach, + &AttachedSessionId, + sizeof(AttachedSessionId)); + if (!NT_SUCCESS(Status)) + { + /* Failed to detach. Note the DPRINT1 has a typo in Windows */ + DPRINT1("SMSS: SmpStartCsr, Couldn't Detach from Session Space. Status=%x\n", Status); + ASSERT(NT_SUCCESS(Status)); + } + else + { + /* Detachment worked, reset our attached session ID */ + AttachedSessionId = -1; + } + + /* And release the privilege we acquired */ + SmpReleasePrivilege(State); + } + } + + /* Since this is the failure path, terminate the subsystem process */ + NtTerminateProcess(ProcessInformation.ProcessHandle, Status); + NtClose(ProcessInformation.ThreadHandle); + +Quickie2: + /* This is the cleanup path -- first dereference our subsystems */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + if (Subsystem) SmpDereferenceSubsystem(Subsystem); + if (KnownSubsystem) SmpDereferenceSubsystem(KnownSubsystem); + + /* In the failure case, destroy the new subsystem we just created */ + if (!NT_SUCCESS(Status)) + { + RemoveEntryList(&NewSubsystem->Entry); + NtSetEvent(NewSubsystem->Event, 0); + if (NewSubsystem) SmpDereferenceSubsystem(NewSubsystem); + } + + /* Finally, we're all done! */ + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return Status; } NTSTATUS

12 years, 10 months

[ion] 55508: [SMSS2]: Implement SmpExecPgm and SmpSbCreateSession. Nothing happens (STATUS_OBJECT_NAME_NOT_FOUND is returned) because we don't really launch CSRSS and so we can't find a subsystem f...

by ion＠svn.reactos.org

Author: ion Date: Thu Feb 9 00:07:36 2012 New Revision: 55508 URL: http://svn.reactos.org/svn/reactos?rev=55508&view=rev Log: [SMSS2]: Implement SmpExecPgm and SmpSbCreateSession. Nothing happens (STATUS_OBJECT_NAME_NOT_FOUND is returned) because we don't really launch CSRSS and so we can't find a subsystem for Winlogon and fail (as expected for now). Modified: trunk/reactos/base/system/smss2/smloop.c trunk/reactos/base/system/smss2/smsbapi.c Modified: trunk/reactos/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c… ============================================================================== --- trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Thu Feb 9 00:07:36 2012 @@ -71,8 +71,69 @@ IN PSMP_CLIENT_CONTEXT ClientContext, IN HANDLE SmApiPort) { - DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + HANDLE ProcessHandle; + NTSTATUS Status; + PSM_EXEC_PGM_MSG SmExecPgm; + RTL_USER_PROCESS_INFORMATION ProcessInformation; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Open the client process */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&ProcessHandle, + PROCESS_DUP_HANDLE, + &ObjectAttributes, + &SmApiMsg->h.ClientId); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("SmExecPgm: NtOpenProcess Failed %lx\n", Status); + return Status; + } + + /* Copy the process information out of the message */ + SmExecPgm = &SmApiMsg->u.ExecPgm; + ProcessInformation = SmExecPgm->ProcessInformation; + + /* Duplicate the process handle */ + Status = NtDuplicateObject(ProcessHandle, + SmExecPgm->ProcessInformation.ProcessHandle, + NtCurrentProcess(), + &ProcessInformation.ProcessHandle, + PROCESS_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Close the handle and fail */ + NtClose(ProcessHandle); + DPRINT1("SmExecPgm: NtDuplicateObject (Process) Failed %lx\n", Status); + return Status; + } + + /* Duplicate the thread handle */ + Status = NtDuplicateObject(ProcessHandle, + SmExecPgm->ProcessInformation.ThreadHandle, + NtCurrentProcess(), + &ProcessInformation.ThreadHandle, + THREAD_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Close both handles and fail */ + NtClose(ProcessInformation.ProcessHandle); + NtClose(ProcessHandle); + DPRINT1("SmExecPgm: NtDuplicateObject (Thread) Failed %lx\n", Status); + return Status; + } + + /* Close the process handle and call the internal client API */ + NtClose(ProcessHandle); + return SmpSbCreateSession(NULL, + NULL, + &ProcessInformation, + 0, + SmExecPgm->DebugFlag ? &SmApiMsg->h.ClientId : NULL); } NTSTATUS Modified: trunk/reactos/base/system/smss2/smsbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsbapi.… ============================================================================== --- trunk/reactos/base/system/smss2/smsbapi.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsbapi.c [iso-8859-1] Thu Feb 9 00:07:36 2012 @@ -14,4 +14,173 @@ /* GLOBALS ********************************************************************/ +PCHAR SmpSubSystemNames[] = +{ + "Unknown", + "Native", + "Windows", + "Posix", + "OS/2" +}; + /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpSbCreateSession(IN PVOID Reserved, + IN PSMP_SUBSYSTEM OtherSubsystem, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, + IN ULONG MuSessionId, + IN PCLIENT_ID DbgClientId) +{ + NTSTATUS Status; + PSMP_SUBSYSTEM KnownSubsys; + SB_API_MSG SbApiMsg; + ULONG SessionId; + PSB_CREATE_SESSION_MSG CreateSessionMsg; + + /* Write out the create session message including its initial process */ + CreateSessionMsg = &SbApiMsg.CreateSession; + CreateSessionMsg->ProcessInfo = *ProcessInformation; + CreateSessionMsg->MuSessionId = MuSessionId; + if (DbgClientId) + { + CreateSessionMsg->ClientId = *DbgClientId; + } + else + { + CreateSessionMsg->ClientId.UniqueThread = NULL; + CreateSessionMsg->ClientId.UniqueProcess = NULL; + } + + /* Find a subsystem responsible for this session */ + SmpGetProcessMuSessionId(ProcessInformation->ProcessHandle, &MuSessionId); + if (!SmpCheckDuplicateMuSessionId(MuSessionId)) + { + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + DPRINT1("SMSS: CreateSession status=%x\n", STATUS_OBJECT_NAME_NOT_FOUND); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Find the subsystem we have for this initial process */ + KnownSubsys = SmpLocateKnownSubSysByType(MuSessionId, + ProcessInformation-> + ImageInformation.SubSystemType); + if (KnownSubsys) + { + /* Duplicate the process handle into the message */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation->ProcessHandle, + KnownSubsys->ProcessHandle, + &CreateSessionMsg->ProcessInfo.ProcessHandle, + PROCESS_ALL_ACCESS, + 0, + 0); + if (NT_SUCCESS(Status)) + { + /* Duplicate the thread handle into the message */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation->ThreadHandle, + KnownSubsys->ProcessHandle, + &CreateSessionMsg->ProcessInfo.ThreadHandle, + THREAD_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Close everything on failure */ + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + SmpDereferenceSubsystem(KnownSubsys); + DbgPrint("SmpSbCreateSession: NtDuplicateObject (Thread) Failed %lx\n", Status); + return Status; + } + + /* Close the original handles as they are no longer needed */ + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + + /* Finally, allocate a new SMSS session ID for this session */ + SessionId = SmpAllocateSessionId(KnownSubsys, OtherSubsystem); + CreateSessionMsg->SessionId = SessionId; + + /* Fill out the LPC message header and send it to the client! */ + SbApiMsg.ApiNumber = SbpCreateSession; + SbApiMsg.h.u2.ZeroInit = 0; + SbApiMsg.h.u1.s1.DataLength = sizeof(SB_CREATE_SESSION_MSG) + 8; + SbApiMsg.h.u1.s1.TotalLength = sizeof(SbApiMsg); + Status = NtRequestWaitReplyPort(KnownSubsys->SbApiPort, + &SbApiMsg.h, + &SbApiMsg.h); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + DPRINT1("SmpSbCreateSession: NtRequestWaitReply Failed %lx\n", Status); + } + else + { + /* If the API succeeded, get the result value from the LPC */ + Status = SbApiMsg.ReturnValue; + } + + /* Delete the session on any kind of failure */ + if (!NT_SUCCESS(Status)) SmpDeleteSession(SessionId); + } + else + { + /* Close the handles on failure */ + DPRINT1("SmpSbCreateSession: NtDuplicateObject (Process) Failed %lx\n", Status); + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + } + + /* Dereference the subsystem and return the status of the LPC call */ + SmpDereferenceSubsystem(KnownSubsys); + return Status; + } + + /* If we don't yet have a subsystem, only native images can be launched */ + if (ProcessInformation->ImageInformation.SubSystemType != IMAGE_SUBSYSTEM_NATIVE) + { + /* Fail */ + DPRINT1("SMSS: %s SubSystem has not been started.\n", + SmpSubSystemNames[ProcessInformation->ImageInformation.SubSystemType]); + Status = STATUS_UNSUCCESSFUL; + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + return Status; + } + +#if 0 + /* This code handles debug applications, but it seems vestigial... */ + if ((*(ULONGLONG)&CreateSessionMsg.ClientId) && (SmpDbgSsLoaded)) + { + Process = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_PROCESS)); + if (!Process) + { + DPRINT1("Unable to initialize debugging for Native App %lx.%lx -- out of memory\n", + ProcessInformation->ClientId.UniqueProcess, + ProcessInformation->ClientId.UniqueThread); + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + return STATUS_NO_MEMORY; + } + + Process->DbgClientId = CreateSessionMsg->ClientId; + Process->ClientId = ProcessInformation->ClientId; + InsertHeadList(&NativeProcessList, &Process->Entry); + DPRINT1("Native Debug App %lx.%lx\n", Process->ClientId.UniqueProcess, Process->ClientId.UniqueThread); + + Status = NtSetInformationProcess(ProcessInformation->ProcessHandle, 7, &SmpDebugPort, 4); + ASSERT(NT_SUCCESS(Status)); + } +#endif + + /* This is a native application being started as the initial command */ + DPRINT1("Subsystem active, starting thread\n"); + NtClose(ProcessInformation->ProcessHandle); + NtResumeThread(ProcessInformation->ThreadHandle, NULL); + NtClose(ProcessInformation->ThreadHandle); + return STATUS_SUCCESS; +}

12 years, 10 months

[ion] 55507: [SMSS2]: Make not-implemented functions return a failure. Cleanup the SMSS hack in the _main function to be cleaner. Add a few more functions and flags to the header. Fix a function pr...

by ion＠svn.reactos.org

Author: ion Date: Wed Feb 8 23:49:19 2012 New Revision: 55507 URL: http://svn.reactos.org/svn/reactos?rev=55507&view=rev Log: [SMSS2]: Make not-implemented functions return a failure. Cleanup the SMSS hack in the _main function to be cleaner. Add a few more functions and flags to the header. Fix a function prototype. Modified: trunk/reactos/base/system/smss2/smloop.c trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smss.h trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c… ============================================================================== --- trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Wed Feb 8 23:49:19 2012 @@ -42,7 +42,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -52,7 +52,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -62,7 +62,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -72,7 +72,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -82,7 +82,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -92,7 +92,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -102,7 +102,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } PSM_API_HANDLER SmpApiDispatch[SmMaxApiNumber] = Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Wed Feb 8 23:49:19 2012 @@ -265,7 +265,8 @@ &Directory, CommandLine, MuSessionId, - ProcessId); + ProcessId, + Flags); } else if (Flags & SMP_INVALID_PATH) { @@ -590,7 +591,7 @@ NTSTATUS NTAPI -LaunchOldSmss(OUT PHANDLE Handles) +LaunchOldSmss(VOID) { PINIT_BUFFER InitBuffer; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; @@ -598,9 +599,6 @@ NTSTATUS Status; PCHAR Environment; - /* No handles at first */ - Handles[0] = Handles[1] = NULL; - /* Initialize the system root */ RtlInitUnicodeString(&SmpSystemRoot, SharedUserData->NtSystemRoot); @@ -623,8 +621,6 @@ } /* Return the handle and status */ - Handles[0] = ProcessInfo->ProcessHandle; - Handles[1] = ProcessInfo->ProcessHandle; return Status; } @@ -723,6 +719,8 @@ /* Enter SEH so we can terminate correctly if anything goes wrong */ _SEH2_TRY { + LARGE_INTEGER Infinite = {{0x80000000, 0x7FFFFFFF}}; + /* Initialize SMSS */ Status = SmpInit(&InitialCommand, Handles); if (!NT_SUCCESS(Status)) @@ -731,9 +729,10 @@ RtlInitUnicodeString(&DbgString, L"Session Manager Initialization"); Parameters[1] = Status; DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); - Status = LaunchOldSmss(Handles); - goto SetupHack; //_SEH2_LEAVE; Hack so that setup can work. will go away later + Status = LaunchOldSmss(); + if (!NT_SUCCESS(Status)) return Status; + return NtDelayExecution(FALSE, &Infinite); } /* Get the global flags */ @@ -750,19 +749,6 @@ DPRINT1("Global Flags Set to SMSS Debugging: Not yet supported\n"); } - /* Launch the original SMSS */ - DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); - Status = LaunchOldSmss(Handles); - if (!NT_SUCCESS(Status)) - { - /* Fail and raise a hard error */ - DPRINT1("SMSS: Execute Old SMSS failed\n"); - RtlInitUnicodeString(&DbgString, - L"Session Manager LaunchOldSmss"); - Parameters[1] = Status; - _SEH2_LEAVE; - } - /* Execute the initial command (Winlogon.exe) */ Status = SmpExecuteInitialCommand(0, &InitialCommand, &Handles[1], NULL); if (!NT_SUCCESS(Status)) @@ -772,7 +758,11 @@ RtlInitUnicodeString(&DbgString, L"Session Manager ExecuteInitialCommand"); Parameters[1] = Status; - _SEH2_LEAVE; + //_SEH2_LEAVE; + DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); + Status = LaunchOldSmss(); + if (!NT_SUCCESS(Status)) return Status; + return NtDelayExecution(FALSE, &Infinite); } /* Check if we're already attached to a session */ @@ -789,7 +779,6 @@ SmpReleasePrivilege(State); /* Wait on either CSRSS or Winlogon to die */ -SetupHack: Status = NtWaitForMultipleObjects(RTL_NUMBER_OF(Handles), Handles, WaitAny, Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Wed Feb 8 23:49:19 2012 @@ -38,6 +38,8 @@ #define SMP_SUBSYSTEM_FLAG 0x08 #define SMP_INVALID_PATH 0x10 #define SMP_DEFERRED_FLAG 0x20 +#define SMP_POSIX_FLAG 0x100 +#define SMP_OS2_FLAG 0x200 /* STRUCTURES *****************************************************************/ @@ -87,6 +89,7 @@ extern LIST_ENTRY SmpExecuteList; extern LIST_ENTRY SmpSubSystemList; extern ULONG AttachedSessionId; +extern BOOLEAN SmpDebug; /* FUNCTIONS ******************************************************************/ @@ -182,7 +185,8 @@ IN PUNICODE_STRING Directory, IN PUNICODE_STRING CommandLine, IN ULONG MuSessionId, - OUT PHANDLE ProcessId + OUT PHANDLE ProcessId, + IN ULONG Flags ); NTSTATUS @@ -250,4 +254,44 @@ IN PSMP_SUBSYSTEM SubSystem ); +NTSTATUS +NTAPI +SmpSbCreateSession( + IN PVOID Reserved, + IN PSMP_SUBSYSTEM OtherSubsystem, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, + IN ULONG MuSessionId, + IN PCLIENT_ID DbgClientId +); + +ULONG +NTAPI +SmpAllocateSessionId( + IN PSMP_SUBSYSTEM Subsystem, + IN PSMP_SUBSYSTEM OtherSubsystem +); + +VOID +NTAPI +SmpDeleteSession( + IN ULONG SessionId +); + +BOOLEAN +NTAPI +SmpCheckDuplicateMuSessionId( + IN ULONG MuSessionId +); + +NTSTATUS +NTAPI +SmpExecuteImage( + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING Directory, + IN PUNICODE_STRING CommandLine, + IN ULONG MuSessionId, + IN ULONG Flags, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation +); + #endif Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Wed Feb 8 23:49:19 2012 @@ -120,7 +120,8 @@ IN PUNICODE_STRING Directory, IN PUNICODE_STRING CommandLine, IN ULONG MuSessionId, - OUT PHANDLE ProcessId) + OUT PHANDLE ProcessId, + IN ULONG Flags) { DPRINT1("Should start subsystem %wZ for Session: %lx\n", FileName, MuSessionId); return STATUS_SUCCESS;

12 years, 10 months

← Newer
1
...
40
41
42
43
44
45
46
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012