Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 51407: [USBEHCI_NEW] hub_controller: - Implement StatusChangeEndpointCallBack called by HardwareDevice class when port status has changed on controller. - Move Status Change Endpoint que...
by mjmartin＠svn.reactos.org 20 Apr '11

20 Apr '11

Author: mjmartin Date: Wed Apr 20 04:30:22 2011 New Revision: 51407 URL: http://svn.reactos.org/svn/reactos?rev=51407&view=rev Log: [USBEHCI_NEW] hub_controller: - Implement StatusChangeEndpointCallBack called by HardwareDevice class when port status has changed on controller. - Move Status Change Endpoint query code to IQueryStatusChageEndpoint as it is also needed by StatusChangeEndpointCallBack. usb_request: - Implement InternalCreateUsbRequest. usb_queue: - Implement CreateUsbRequest and AddUsbRequest hardware: - Implement GetAsyncListRegister and GetPeriodicListRegister. - Implement SetStatusChangeEndpointCallBack for setting callback and context. Call the callback when a port status changes. - Initialize the UsbQueue after creating the AsyncQueueHead, as the UsbQueue calls will call back with GetAsyncListRegister. Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Wed Apr 20 04:30:22 2011 @@ -12,6 +12,8 @@ #include "usbehci.h" #include "hardware.h" +typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext); + BOOLEAN NTAPI InterruptServiceRoutine( @@ -66,6 +68,10 @@ VOID SetAsyncListRegister(ULONG PhysicalAddress); VOID SetPeriodicListRegister(ULONG PhysicalAddress); + ULONG GetAsyncListRegister(); + ULONG GetPeriodicListRegister(); + + VOID SetStatusChangeEndpointCallBack(PVOID CallBack, PVOID Context); KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); @@ -100,7 +106,8 @@ PQUEUE_HEAD AsyncQueueHead; PUSBQUEUE m_UsbQueue; PDMAMEMORYMANAGER m_MemoryManager; - + HD_INIT_CALLBACK* m_SCECallBack; + PVOID m_SCEContext; VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); @@ -385,16 +392,6 @@ return Status; } - // - // Initialize the UsbQueue now that we have an AdapterObject. - // - Status = m_UsbQueue->Initialize(PUSBHARDWAREDEVICE(this), m_Adapter, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to Initialize the UsbQueue\n"); - return Status; - } - // // Create a queuehead for the Async Register // @@ -413,7 +410,19 @@ AsyncQueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; AsyncQueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x03; + InitializeListHead(&AsyncQueueHead->LinkedQueueHeads); + SetAsyncListRegister(AsyncQueueHead->PhysicalAddr); + + // + // Initialize the UsbQueue now that we have an AdapterObject. + // + Status = m_UsbQueue->Initialize(PUSBHARDWAREDEVICE(this), m_Adapter, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to Initialize the UsbQueue\n"); + return Status; + } // // Start the controller @@ -838,6 +847,26 @@ EHCI_WRITE_REGISTER_ULONG(EHCI_PERIODICLISTBASE, PhysicalAddress); } +ULONG +CUSBHardwareDevice::GetAsyncListRegister() +{ + return PhysicalAddress.LowPart; +} + +ULONG CUSBHardwareDevice::GetPeriodicListRegister() +{ + UNIMPLEMENTED + return NULL; +} + +VOID CUSBHardwareDevice::SetStatusChangeEndpointCallBack( + PVOID CallBack, + PVOID Context) +{ + m_SCECallBack = (HD_INIT_CALLBACK*)CallBack; + m_SCEContext = Context; +} + KIRQL CUSBHardwareDevice::AcquireDeviceLock(void) { @@ -937,7 +966,7 @@ // // Clear the port change status // - This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), PortStatus | EHCI_PRT_CONNECTSTATUSCHANGE); + //This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), PortStatus | EHCI_PRT_CONNECTSTATUSCHANGE); if (PortStatus & EHCI_PRT_CONNECTED) { @@ -964,6 +993,7 @@ // FIXME: Is a port reset needed, or does hub driver request this? // } + This->m_SCECallBack(This->m_SCEContext); } else { Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Wed Apr 20 04:30:22 2011 @@ -10,6 +10,9 @@ #define INITGUID #include "usbehci.h" + +VOID StatusChangeEndpointCallBack( + PVOID Context); class CHubController : public IHubController, public IDispatchIrp @@ -62,7 +65,8 @@ NTSTATUS HandleSelectConfiguration(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); - + + friend VOID StatusChangeEndpointCallBack(PVOID Context); // constructor / destructor CHubController(IUnknown *OuterUnknown){} @@ -91,6 +95,9 @@ PULONG m_DeviceAddressBitmapBuffer; LIST_ENTRY m_UsbDeviceList; PIRP m_PendingSCEIrp; + + //Internal Functions + BOOLEAN QueryStatusChageEndpoint(PIRP Irp); }; typedef struct @@ -254,12 +261,72 @@ } // + // Set the SCE Callback that the Hardware Device will call on port status change + // + Device->SetStatusChangeEndpointCallBack((PVOID)StatusChangeEndpointCallBack, this); + // // clear init flag // m_HubControllerDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; +} + +// +// Queries the ports to see if there has been a device connected or removed. +// +BOOLEAN +CHubController::QueryStatusChageEndpoint( + PIRP Irp) +{ + ULONG PortCount, PortId; + PIO_STACK_LOCATION IoStack; + USHORT PortStatus, PortChange; + PURB Urb; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(IoStack); + + // + // Get the Urb + // + Urb = (PURB)IoStack->Parameters.Others.Argument1; + ASSERT(Urb); + + // + // Get the number of ports and check each one for device connected + // + m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); + DPRINT1("SCE Request\n"); + ((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 0; + for (PortId = 0; PortId < PortCount; PortId++) + { + m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); + + DPRINT1("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); + + // + // Loop the ports + // + if ((PortStatus & USB_PORT_STATUS_CONNECT) && (PortChange & USB_PORT_STATUS_CONNECT)) + { + DPRINT1("Device is connected on port %d\n", PortId); + // Set the value for the port number + ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((PortId + 1) & 7); + } + } + + // + // If there were changes then return TRUE + // + if (((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] != 0) + return TRUE; + + return FALSE; } //----------------------------------------------------------------------------------------- @@ -693,9 +760,6 @@ IN OUT PIRP Irp, PURB Urb) { - ULONG PortCount, PortId; - USHORT PortStatus, PortChange; - // // First check if the request is for the Status Change Endpoint // @@ -703,42 +767,13 @@ // // Is the Request for the root hub // - if (Urb->UrbHeader.UsbdDeviceHandle==0) - { - // - // There should only be one SCE request pending at a time - // - ASSERT (m_PendingSCEIrp == NULL); - - // - // Get the number of ports and check each one for device connected - // - m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); - DPRINT1("SCE Request\n"); - DPRINT1("PortCount %d\n", PortCount); - ((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 0; - for (PortId = 0; PortId < PortCount; PortId++) - { - m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); - - DPRINT1("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); - - // - // FIXME: Verify that this is correct. - // - if ((PortStatus & USB_PORT_STATUS_CONNECT) && (PortChange & USB_PORT_STATUS_CONNECT)) - { - DPRINT1("Device is connected on port %d\n", PortId); - ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((PortId + 1) & 7); - break; - } - } - - // - // If there were changes then return SUCCESS - // - if (((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] != 0) + if (Urb->UrbHeader.UsbdDeviceHandle == 0) + { + ASSERT(m_PendingSCEIrp == NULL); + if (QueryStatusChageEndpoint(Irp)) + { return STATUS_SUCCESS; + } // // Else pend the IRP, to be completed when a device connects or disconnects. @@ -747,6 +782,7 @@ IoMarkIrpPending(Irp); return STATUS_PENDING; } + UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; } @@ -2843,3 +2879,22 @@ // return STATUS_SUCCESS; } + +VOID StatusChangeEndpointCallBack(PVOID Context) +{ + CHubController* This; + PIRP Irp; + This = (CHubController*)Context; + + ASSERT(This); + + DPRINT1("SCE Notification!\n"); + Irp = This->m_PendingSCEIrp; + This->m_PendingSCEIrp = NULL; + + This->QueryStatusChageEndpoint(Irp); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Wed Apr 20 04:30:22 2011 @@ -261,6 +261,30 @@ // This is the location at which the controller will start executing the Periodic Schedule. // virtual VOID SetPeriodicListRegister(ULONG PhysicalAddress) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetAsyncListRegister +// +// Description: Returns the memory address used in the Asynchronous Register +// + virtual ULONG GetAsyncListRegister() = 0; + +//----------------------------------------------------------------------------------------- +// +// GetPeriodicListRegister +// +// Description: Returns the the memory address used in the Periodic Register +// + virtual ULONG GetPeriodicListRegister() = 0; + +//----------------------------------------------------------------------------------------- +// +// SetStatusChangeEndpointCallBack +// +// Description: Used to callback to the hub controller when SCE detected +// + virtual VOID SetStatusChangeEndpointCallBack(PVOID CallBack,PVOID Context) = 0; //----------------------------------------------------------------------------------------- // Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Wed Apr 20 04:30:22 2011 @@ -48,8 +48,8 @@ LONG m_Ref; KSPIN_LOCK m_Lock; PDMA_ADAPTER m_Adapter; - PQUEUE_HEAD AsyncQueueHead; - PQUEUE_HEAD PendingQueueHead; + PQUEUE_HEAD AsyncListQueueHead; + PQUEUE_HEAD PendingListQueueHead; VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); VOID UnlinkQueueHead(PQUEUE_HEAD QueueHead); @@ -93,6 +93,26 @@ // KeInitializeSpinLock(&m_Lock); + // + // Get the AsyncQueueHead + // + AsyncListQueueHead = (PQUEUE_HEAD)Hardware->GetAsyncListRegister(); + + // + // Create the PendingListQueueHead from NONPAGEDPOOL. It will never be linked into the Asynclist Schedule + // + PendingListQueueHead = (PQUEUE_HEAD)ExAllocatePoolWithTag(NonPagedPool, sizeof(QUEUE_HEAD), TAG_USBEHCI); + if (!PendingListQueueHead) + { + DPRINT1("Pool Allocation failed!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Initialize the List Head + // + InitializeListHead(&PendingListQueueHead->LinkedQueueHeads); + return Status; } @@ -112,31 +132,50 @@ CUSBQueue::AddUSBRequest( IUSBRequest * Request) { + PQUEUE_HEAD QueueHead; + ASSERT(Request != NULL); + + Request->GetQueueHead(&QueueHead); + + // + // Add it to the pending list + // + LinkQueueHead(PendingListQueueHead, QueueHead); + + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBQueue::AddUSBRequest( + PURB Urb) +{ UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; } NTSTATUS -CUSBQueue::AddUSBRequest( - PURB Urb) +CUSBQueue::CancelRequests() { UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; } NTSTATUS -CUSBQueue::CancelRequests() -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CUSBQueue::CreateUSBRequest( IUSBRequest **OutRequest) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PUSBREQUEST UsbRequest; + NTSTATUS Status; + + *OutRequest = NULL; + Status = InternalCreateUSBRequest(&UsbRequest); + + if (NT_SUCCESS(Status)) + { + *OutRequest = UsbRequest; + } + + return Status; } // Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Wed Apr 20 04:30:22 2011 @@ -934,4 +934,38 @@ // return FALSE; } -} +} + +NTSTATUS +InternalCreateUSBRequest( + PUSBREQUEST *OutRequest) +{ + PUSBREQUEST This; + + // + // allocate requests + // + This = new(NonPagedPool, TAG_USBEHCI) CUSBRequest(0); + if (!This) + { + // + // failed to allocate + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // add reference count + // + This->AddRef(); + + // + // return result + // + *OutRequest = (PUSBREQUEST)This; + + // + // done + // + return STATUS_SUCCESS; +} Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Wed Apr 20 04:30:22 2011 @@ -95,4 +95,9 @@ // NTSTATUS CreateUSBQueue(PUSBQUEUE *OutUsbQueue); +// +// usb_request.cpp +// +NTSTATUS InternalCreateUSBRequest(PUSBREQUEST *OutRequest); + #endif

1 0

[janderwald] 51406: [USBEHCI_NEW] - Fix warning because comparing signed vs unsigned - Implement function for retrieving the device descriptor - Implement function for retrieving a configuration de...
by janderwald＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: janderwald Date: Tue Apr 19 18:35:40 2011 New Revision: 51406 URL: http://svn.reactos.org/svn/reactos?rev=51406&view=rev Log: [USBEHCI_NEW] - Fix warning because comparing signed vs unsigned - Implement function for retrieving the device descriptor - Implement function for retrieving a configuration descriptor (including contained interface descriptor and endpoint descriptor) - Cleanup interface for IUSBRequest: - When caller initializes IUSBRequest with an IRP, then the operation mode is asynchronously. Therefore when the request is completed, IUSBRequest::ShouldReleaseRequestAfterCompletion will return true, which makes IUSBQueue call Release on IUSBRequest - When the caller initializes IUSBRequest with an setup packet, the operation mode is synchronously. After submitting the IUSBRequest to queue, the caller should call IUSBRequest::GetResultStatus. This function will then block untill the operation has been completed. However, the caller needs to call Release() as those requests are not cleaned up by the IUSBQueue Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Tue Apr 19 18:35:40 2011 @@ -288,7 +288,7 @@ return STATUS_UNSUCCESSFUL; } - if (BufferLength < m_HubDeviceInterfaceString.Length - 8) + if (BufferLength < (ULONG)m_HubDeviceInterfaceString.Length - 8) { // // buffer too small @@ -774,7 +774,7 @@ // // sanity check // - PC_ASSERT(Urb->UrbControlVendorClassRequest.Index - 1 < NumPort); + PC_ASSERT(Urb->UrbControlVendorClassRequest.Index - 1 < (USHORT)NumPort); // // port range reported start from 1 -n @@ -1882,7 +1882,8 @@ // // submit urb // - Status = UsbDevice->SubmitUrb(Urb); + //Status = UsbDevice->SubmitUrb(Urb); + UNIMPLEMENTED if (NT_SUCCESS(Status)) { Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Tue Apr 19 18:35:40 2011 @@ -171,6 +171,15 @@ // Do not call Initialize on IUSBQueue, the object is already initialized virtual NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetDMA +// +// Description: returns the DMA object which can be used to allocate memory from the common buffer + + virtual NTSTATUS GetDMA(OUT struct IDMAMemoryManager **OutDMAMemoryManager) = 0; + //----------------------------------------------------------------------------------------- // @@ -363,40 +372,33 @@ // The irp contains an URB block which contains all necessary information virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, - IN OUT PIRP Irp); - -//----------------------------------------------------------------------------------------- -// -// SetCompletionEvent -// -// Description: sets up completion event which is signaled when the -// request is completed or cancelled - - virtual NTSTATUS SetCompletionEvent(IN PKEVENT Event) = 0; + IN OUT PIRP Irp) = 0; //----------------------------------------------------------------------------------------- // // CompletionCallback // // Description: called when request has been completed. It is called when -// IUSBQueue completes the request +// IUSBQueue completes a queue head virtual VOID CompletionCallback(IN NTSTATUS NtStatusCode, - IN ULONG UrbStatusCode) = 0; + IN ULONG UrbStatusCode, + IN struct _QUEUE_HEAD *QueueHead) = 0; //----------------------------------------------------------------------------------------- // // CancelCallback // -// Description: called when request is cancelled. Called by IUSBQueue - - virtual VOID CancelCallback(IN NTSTATUS NtStatusCode) = 0; +// Description: called when the queue head is cancelled + + virtual VOID CancelCallback(IN NTSTATUS NtStatusCode, + IN struct _QUEUE_HEAD *QueueHead) = 0; //----------------------------------------------------------------------------------------- // // GetQueueHead // -// Description: returns an initialized queue head with contains the all transfer descriptors +// Description: returns an initialized queue head which contains all transfer descriptors virtual NTSTATUS GetQueueHead(struct _QUEUE_HEAD ** OutHead) = 0; @@ -406,6 +408,9 @@ // // Description: returns true when the request has been completed // Should be called after the CompletionCallback has been invoked +// This function is called by IUSBQueue after queue head has been completed +// If the function returns true, IUSBQueue will then call ShouldReleaseRequestAfterCompletion +// If that function returns also true, it calls Release() to delete the IUSBRequest virtual BOOLEAN IsRequestComplete() = 0; @@ -417,6 +422,34 @@ virtual ULONG GetTransferType() = 0; +//----------------------------------------------------------------------------------------- +// +// GetResultStatus +// +// Description: returns the status code of the result +// Note: this function will block the caller untill the request has been completed + + virtual VOID GetResultStatus(OUT OPTIONAL NTSTATUS * NtStatusCode, + OUT OPTIONAL PULONG UrbStatusCode) = 0; + +//----------------------------------------------------------------------------------------- +// +// IsRequestInitialized +// +// Description: returns true when the request has been successfully initialized using InitializeXXX methods + + virtual BOOLEAN IsRequestInitialized() = 0; + +//----------------------------------------------------------------------------------------- +// +// ShouldReleaseRequestAfterCompletion +// +// Description: this function gets called when the request returns +// IUSBQueue will then call Release() on the object to release all associated memory +// This function will typically return true when the request has been initialized with an irp +// If the request was initialized with an setup packet, it will return false + + virtual BOOLEAN ShouldReleaseRequestAfterCompletion() = 0; }; typedef IUSBRequest *PUSBREQUEST; @@ -446,7 +479,7 @@ // // GetPendingRequestCount // -// Description: returns the number of pending requests +// Description: returns the number of pending requests true from IsRequestComplete virtual ULONG GetPendingRequestCount() = 0; @@ -608,7 +641,7 @@ // // Description: gets the device address of the this device - virtual ULONG GetDeviceAddress() = 0; + virtual UCHAR GetDeviceAddress() = 0; //----------------------------------------------------------------------------------------- @@ -657,7 +690,7 @@ // // Description: sets device handle data - virtual NTSTATUS SetDeviceAddress(ULONG DeviceAddress) = 0; + virtual NTSTATUS SetDeviceAddress(UCHAR DeviceAddress) = 0; //----------------------------------------------------------------------------------------- // @@ -677,11 +710,11 @@ //----------------------------------------------------------------------------------------- // -// SubmitUrb -// -// Description: submits an urb - - virtual NTSTATUS SubmitUrb(PURB Urb) = 0; +// SubmitIrp +// +// Description: submits an irp containing an urb + + virtual NTSTATUS SubmitIrp(PIRP Urb) = 0; }; Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Tue Apr 19 18:35:40 2011 @@ -11,6 +11,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 { public: @@ -37,20 +55,22 @@ virtual NTSTATUS Initialize(IN PHUBCONTROLLER HubController, IN PUSBHARDWAREDEVICE Device, IN PVOID Parent, IN ULONG Port, IN ULONG PortStatus); virtual BOOLEAN IsHub(); virtual NTSTATUS GetParent(PVOID * Parent); - virtual ULONG GetDeviceAddress(); + virtual UCHAR GetDeviceAddress(); virtual ULONG GetPort(); virtual USB_DEVICE_SPEED GetSpeed(); virtual USB_DEVICE_TYPE GetType(); virtual ULONG GetState(); virtual void SetDeviceHandleData(PVOID Data); - virtual NTSTATUS SetDeviceAddress(ULONG DeviceAddress); + virtual NTSTATUS SetDeviceAddress(UCHAR DeviceAddress); virtual void GetDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); virtual UCHAR GetConfigurationValue(); - virtual NTSTATUS SubmitUrb(PURB Urb); + virtual NTSTATUS SubmitIrp(PIRP Irp); // local function - virtual NTSTATUS CommitUrb(PURB Urb); - virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN ULONG BufferLength, IN OUT PVOID Buffer, IN OPTIONAL PIRP Irp, IN OPTIONAL PKEVENT pEvent); + virtual NTSTATUS CommitIrp(PIRP Irp); + virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN ULONG BufferLength, IN OUT PMDL Mdl); + virtual NTSTATUS CreateConfigurationDescriptor(ULONG ConfigurationIndex); + virtual NTSTATUS CreateDeviceDescriptor(); // constructor / destructor CUSBDevice(IUnknown *OuterUnknown){} @@ -62,13 +82,15 @@ PUSBHARDWAREDEVICE m_Device; PVOID m_Parent; ULONG m_Port; - ULONG m_DeviceAddress; + UCHAR m_DeviceAddress; PVOID m_Data; KSPIN_LOCK m_Lock; USB_DEVICE_DESCRIPTOR m_DeviceDescriptor; ULONG m_PortStatus; PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; + + PUSB_CONFIGURATION m_ConfigurationDescriptors; }; //---------------------------------------------------------------------------------------- @@ -126,19 +148,445 @@ } // - // FIXME: get dma manager - // - //Status = m_Device->GetDMA(&m_DmaManager); - if (!NT_SUCCESS(Status)) - { - // - // failed to get usb queue - // - DPRINT1("CUSBDevice::Initialize GetUsbQueue failed with %x\n", Status); - return Status; - } - - + // get dma manager + // + Status = m_Device->GetDMA(&m_DmaManager); + if (!NT_SUCCESS(Status)) + { + // + // failed to get dma manager + // + DPRINT1("CUSBDevice::Initialize GetDMA failed with %x\n", Status); + return Status; + } + + // + // sanity check + // + PC_ASSERT(m_DmaManager); + + // + // get device descriptor + // + Status = CreateDeviceDescriptor(); + if (!NT_SUCCESS(Status)) + { + // + // failed to get device descriptor + // + DPRINT1("CUSBDevice::Initialize Failed to get device descriptor with %x\n", Status); + return Status; + } + + // + // done + // + return Status; +} + +//---------------------------------------------------------------------------------------- +BOOLEAN +CUSBDevice::IsHub() +{ + // + // USB Standard Device Class see http://www.usb.org/developers/defined_class/#BaseClass09h + // for details + // + return (m_DeviceDescriptor.bDeviceClass == 0x09 && m_DeviceDescriptor.bDeviceSubClass == 0x00); +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::GetParent( + PVOID * Parent) +{ + // + // returns parent + // + *Parent = m_Parent; + + // + // done + // + return STATUS_SUCCESS; +} + +//---------------------------------------------------------------------------------------- +UCHAR +CUSBDevice::GetDeviceAddress() +{ + // + // get device address + // + return m_DeviceAddress; +} + +//---------------------------------------------------------------------------------------- +ULONG +CUSBDevice::GetPort() +{ + // + // get port to which this device is connected to + // + return m_Port; +} + +//---------------------------------------------------------------------------------------- +USB_DEVICE_SPEED +CUSBDevice::GetSpeed() +{ + if (m_PortStatus & USB_PORT_STATUS_LOW_SPEED) + { + // + // low speed device + // + return UsbLowSpeed; + } + else if (m_PortStatus & USB_PORT_STATUS_HIGH_SPEED) + { + // + // high speed device + // + return UsbHighSpeed; + } + + // + // default to full speed + // + return UsbFullSpeed; +} + +//---------------------------------------------------------------------------------------- +USB_DEVICE_TYPE +CUSBDevice::GetType() +{ + // + // device is encoded into bcdUSB + // + if (m_DeviceDescriptor.bcdUSB == 0x110) + { + // + // USB 1.1 device + // + return Usb11Device; + } + else if (m_DeviceDescriptor.bcdUSB == 0x200) + { + // + // USB 2.0 device + // + return Usb20Device; + } + + DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); + PC_ASSERT(FALSE); + + return Usb11Device; +} + +//---------------------------------------------------------------------------------------- +ULONG +CUSBDevice::GetState() +{ + UNIMPLEMENTED + return FALSE; +} + +//---------------------------------------------------------------------------------------- +void +CUSBDevice::SetDeviceHandleData( + PVOID Data) +{ + // + // set device data, for debugging issues + // + m_Data = Data; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::SetDeviceAddress( + UCHAR DeviceAddress) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + UCHAR OldAddress; + ULONG Index; + + // + // zero request + // + RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + + // + // initialize request + // + CtrlSetup.bRequest = USB_REQUEST_SET_ADDRESS; + CtrlSetup.wValue.W = (USHORT)DeviceAddress; + + // + // set device address + // + Status = CommitSetupPacket(&CtrlSetup, 0, 0); + + // + // check for success + // + if (!NT_SUCCESS(Status)) + { + // + // failed to set device address + // + DPRINT1("CUSBDevice::SetDeviceAddress> failed to set device address with %x Address %x\n", Status, DeviceAddress); + return Status; + } + + // + // back up old address + // + OldAddress = m_DeviceAddress; + + // + // store new device address + // + m_DeviceAddress = DeviceAddress; + + // + // check that setting device address succeeded by retrieving the device descriptor + // + Status = CreateDeviceDescriptor(); + if (!NT_SUCCESS(Status)) + { + // + // failed to retrieve device descriptor + // + DPRINT1("CUSBbDevice::SetDeviceAddress> failed to set new device address %d, falling back to %d Error %x\n", DeviceAddress, OldAddress, Status); + m_DeviceAddress = OldAddress; + + // + // return error status + // + return Status; + } + + // + // sanity checks + // + PC_ASSERT(m_DeviceDescriptor.bNumConfigurations); + + // + // allocate configuration descriptor + // + m_ConfigurationDescriptors = (PUSB_CONFIGURATION) ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations, TAG_USBEHCI); + + // + // zero configuration descriptor + // + RtlZeroMemory(m_ConfigurationDescriptors, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations); + + // + // retrieve the configuration descriptors + // + for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) + { + // + // retrieve configuration descriptors from device + // + Status = CreateConfigurationDescriptor(Index); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CUSBDevice::SetDeviceAddress> failed to retrieve configuration %lu\n", Index); + break; + } + } + + // + // done + // + return Status; + +} + +//---------------------------------------------------------------------------------------- +void +CUSBDevice::GetDeviceDescriptor( + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) +{ + RtlMoveMemory(DeviceDescriptor, &m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); +} + +//---------------------------------------------------------------------------------------- +UCHAR +CUSBDevice::GetConfigurationValue() +{ + UNIMPLEMENTED + return 0x1; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::CommitIrp( + PIRP Irp) +{ + NTSTATUS Status; + PUSBREQUEST Request; + + if (!m_Queue || m_DmaManager) + { + // + // no queue, wtf? + // + DPRINT1("CUSBDevice::CommitUrb> no queue / dma !!!\n"); + return STATUS_UNSUCCESSFUL; + } + + // + // build usb request + // + Status = m_Queue->CreateUSBRequest(&Request); + if (!NT_SUCCESS(Status)) + { + // + // failed to build request + // + DPRINT1("CUSBDevice::CommitSetupPacket> CreateUSBRequest failed with %x\n", Status); + return Status; + } + + // + // initialize request + // + Status = Request->InitializeWithIrp(m_DmaManager, Irp); + + // + // now add the request + // + Status = m_Queue->AddUSBRequest(Request); + if (!NT_SUCCESS(Status)) + { + // + // failed to add request + // + DPRINT1("CUSBDevice::CommitSetupPacket> failed add request to queue with %x\n", Status); + Request->Release(); + return Status; + } + + // + // done + // + return Status; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::SubmitIrp( + PIRP Irp) +{ + KIRQL OldLevel; + NTSTATUS Status; + + // + // acquire device lock + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // commit urb + // + Status = CommitIrp(Irp); + + // + // release lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); + + return Status; +} +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::CommitSetupPacket( + PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, + IN ULONG BufferLength, + IN OUT PMDL Mdl) +{ + NTSTATUS Status; + PUSBREQUEST Request; + + if (!m_Queue) + { + // + // no queue, wtf? + // + DPRINT1("CUSBDevice::CommitSetupPacket> no queue!!!\n"); + return STATUS_UNSUCCESSFUL; + } + + // + // build usb request + // + Status = m_Queue->CreateUSBRequest(&Request); + if (!NT_SUCCESS(Status)) + { + // + // failed to build request + // + DPRINT1("CUSBDevice::CommitSetupPacket> CreateUSBRequest failed with %x\n", Status); + return Status; + } + + // + // initialize request + // + Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, BufferLength, Mdl); + if (!NT_SUCCESS(Status)) + { + // + // failed to initialize request + // + DPRINT1("CUSBDevice::CommitSetupPacket> failed to initialize usb request with %x\n", Status); + Request->Release(); + return Status; + } + + + // + // now add the request + // + Status = m_Queue->AddUSBRequest(Request); + if (!NT_SUCCESS(Status)) + { + // + // failed to add request + // + DPRINT1("CUSBDevice::CommitSetupPacket> failed add request to queue with %x\n", Status); + Request->Release(); + return Status; + } + + // + // get the result code when the operation has been finished + // + Request->GetResultStatus(&Status, NULL); + + // + // release request + // + Request->Release(); + + // + // done + // + return Status; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::CreateDeviceDescriptor() +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + PMDL Mdl; + NTSTATUS Status; // // zero descriptor @@ -155,362 +603,239 @@ CtrlSetup.bmRequestType.B = 0x80; // + // allocate mdl describing the device descriptor + // + Mdl = IoAllocateMdl(&m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR), FALSE, FALSE, 0); + if (!Mdl) + { + // + // failed to allocate mdl + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // build mdl for non paged pool + // + MmBuildMdlForNonPagedPool(Mdl); + + // // commit setup packet // - Status = CommitSetupPacket(&CtrlSetup, sizeof(USB_DEVICE_DESCRIPTOR), &m_DeviceDescriptor, 0, 0); - - // - // check for success - // - if (!NT_SUCCESS(Status)) - { - DPRINT1("CUSBDevice::Initialize CommitSetupPacket failed with %x\n", Status); - } + Status = CommitSetupPacket(&CtrlSetup, sizeof(USB_DEVICE_DESCRIPTOR), Mdl); + + // + // now free the mdl + // + IoFreeMdl(Mdl); // // done // return Status; -} - -//---------------------------------------------------------------------------------------- -BOOLEAN -CUSBDevice::IsHub() -{ - // - // USB Standard Device Class see http://www.usb.org/developers/defined_class/#BaseClass09h - // for details - // - return (m_DeviceDescriptor.bDeviceClass == 0x09 && m_DeviceDescriptor.bDeviceSubClass == 0x00); -} - -//---------------------------------------------------------------------------------------- -NTSTATUS -CUSBDevice::GetParent( - PVOID * Parent) -{ - // - // returns parent - // - *Parent = m_Parent; - - // - // done - // - return STATUS_SUCCESS; -} - -//---------------------------------------------------------------------------------------- -ULONG -CUSBDevice::GetDeviceAddress() -{ - // - // get device address - // - return m_DeviceAddress; -} - -//---------------------------------------------------------------------------------------- -ULONG -CUSBDevice::GetPort() -{ - // - // get port to which this device is connected to - // - return m_Port; -} - -//---------------------------------------------------------------------------------------- -USB_DEVICE_SPEED -CUSBDevice::GetSpeed() -{ - if (m_PortStatus & USB_PORT_STATUS_LOW_SPEED) - { - // - // low speed device - // - return UsbLowSpeed; - } - else if (m_PortStatus & USB_PORT_STATUS_HIGH_SPEED) - { - // - // high speed device - // - return UsbHighSpeed; - } - - // - // default to full speed - // - return UsbFullSpeed; -} - -//---------------------------------------------------------------------------------------- -USB_DEVICE_TYPE -CUSBDevice::GetType() -{ - // - // device is encoded into bcdUSB - // - if (m_DeviceDescriptor.bcdUSB == 0x110) - { - // - // USB 1.1 device - // - return Usb11Device; - } - else if (m_DeviceDescriptor.bcdUSB == 0x200) - { - // - // USB 2.0 device - // - return Usb20Device; - } - - DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); - PC_ASSERT(FALSE); - - return Usb11Device; -} - -//---------------------------------------------------------------------------------------- -ULONG -CUSBDevice::GetState() -{ - UNIMPLEMENTED - return FALSE; -} - -//---------------------------------------------------------------------------------------- -void -CUSBDevice::SetDeviceHandleData( - PVOID Data) -{ - // - // set device data, for debugging issues - // - m_Data = Data; -} - -//---------------------------------------------------------------------------------------- -NTSTATUS -CUSBDevice::SetDeviceAddress( - ULONG DeviceAddress) -{ + +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::CreateConfigurationDescriptor( + ULONG Index) +{ + PVOID Buffer; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; - - // - // zero request - // - RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - - // - // initialize request - // - CtrlSetup.bRequest = USB_REQUEST_SET_ADDRESS; - CtrlSetup.wValue.W = (USHORT)DeviceAddress; - - // - // set device address - // - Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0, 0); - - // - // check for success - // - if (!NT_SUCCESS(Status)) - { - // - // failed to set device address - // - DPRINT1("CUSBDevice::SetDeviceAddress> failed to set device address with %x Address %x\n", Status, DeviceAddress); - return Status; - } - - // - // store device address - // - m_DeviceAddress = DeviceAddress; + PMDL Mdl; + ULONG InterfaceIndex, EndPointIndex; + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndPointDescriptor; + + + // + // sanity checks + // + PC_ASSERT(m_ConfigurationDescriptors); + + // + // first allocate a buffer which should be enough to store all different interfaces and endpoints + // + Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_USBEHCI); + if (!Buffer) + { + // + // failed to allocate buffer + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // build setup packet + // + CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; + CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; + CtrlSetup.bmRequestType._BM.Reserved = 0; + CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.HiByte = USB_CONFIGURATION_DESCRIPTOR_TYPE; + CtrlSetup.wIndex.W = 0; + CtrlSetup.wLength = PAGE_SIZE; + + // + // FIXME: where put configuration index? + // + + // + // now build MDL describing the buffer + // + Mdl = IoAllocateMdl(Buffer, PAGE_SIZE, FALSE, FALSE, 0); + if (!Mdl) + { + // + // failed to allocate mdl + // + ExFreePoolWithTag(Buffer, TAG_USBEHCI); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // build mdl for non paged pool + // + MmBuildMdlForNonPagedPool(Mdl); + + // + // commit packet + // + Status = CommitSetupPacket(&CtrlSetup, PAGE_SIZE, Mdl); + if (!NT_SUCCESS(Status)) + { + // + // failed to issue request, cleanup + // + IoFreeMdl(Mdl); + ExFreePool(Buffer); + return Status; + } + + // + // now free the mdl + // + IoFreeMdl(Mdl); + + // + // get configuration descriptor + // + ConfigurationDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)Buffer; + + // + // sanity check + // + PC_ASSERT(ConfigurationDescriptor->bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + PC_ASSERT(ConfigurationDescriptor->wTotalLength <= PAGE_SIZE); + PC_ASSERT(ConfigurationDescriptor->bNumInterfaces); + + // + // request is complete, initialize configuration descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].ConfigurationDescriptor, ConfigurationDescriptor, ConfigurationDescriptor->bLength); + + // + // now allocate interface descriptors + // + m_ConfigurationDescriptors[Index].Interfaces = (PUSB_INTERFACE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces, TAG_USBEHCI); + if (!m_ConfigurationDescriptors[Index].Interfaces) + { + // + // failed to allocate interface descriptors + // + ExFreePool(Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero interface descriptor + // + RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces); + + // + // get first interface descriptor + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ConfigurationDescriptor + 1); + + // + // setup interface descriptors + // + for(InterfaceIndex = 0; InterfaceIndex < ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) + { + // + // sanity check + // + PC_ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + PC_ASSERT(InterfaceDescriptor->bNumEndpoints); + + // + // copy current interface descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor, InterfaceDescriptor, InterfaceDescriptor->bLength); + + // + // allocate end point descriptors + // + m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBEHCI); + if (!m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints) + { + // + // failed to allocate endpoint + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // zero memory + // + RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints); + + // + // initialize end point descriptors + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)(InterfaceDescriptor + 1); + + for(EndPointIndex = 0; EndPointIndex < InterfaceDescriptor->bNumEndpoints; EndPointIndex++) + { + // + // sanity check + // + PC_ASSERT(EndPointDescriptor->bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); + + // + // copy endpoint descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndPointIndex].EndPointDescriptor, EndPointDescriptor, EndPointDescriptor->bLength); + + // + // move to next offset + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); + } + + // + // update interface descriptor offset + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)EndPointDescriptor; + } + + // + // free buffer + // + ExFreePoolWithTag(Buffer, TAG_USBEHCI); // // done // - return STATUS_SUCCESS; -} - -//---------------------------------------------------------------------------------------- -void -CUSBDevice::GetDeviceDescriptor( - PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) -{ - RtlMoveMemory(DeviceDescriptor, &m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); -} - -//---------------------------------------------------------------------------------------- -UCHAR -CUSBDevice::GetConfigurationValue() -{ - UNIMPLEMENTED - return 0x1; -} - -//---------------------------------------------------------------------------------------- -NTSTATUS -CUSBDevice::CommitUrb( - PURB Urb) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -//---------------------------------------------------------------------------------------- -NTSTATUS -CUSBDevice::SubmitUrb( - PURB Urb) -{ - KIRQL OldLevel; - NTSTATUS Status; - - // - // acquire device lock - // - KeAcquireSpinLock(&m_Lock, &OldLevel); - - // - // commit urb - // - Status = CommitUrb(Urb); - - // - // release lock - // - KeReleaseSpinLock(&m_Lock, OldLevel); - return Status; } -//---------------------------------------------------------------------------------------- -NTSTATUS -CUSBDevice::CommitSetupPacket( - PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, - IN ULONG BufferLength, - IN OUT PVOID Buffer, - IN PIRP Irp, - IN PKEVENT pEvent) -{ - NTSTATUS Status; - PUSBREQUEST Request; - KEVENT Event; - BOOLEAN Wait = FALSE; - PMDL Mdl = 0; - - - if (!m_Queue) - { - // - // no queue, wtf? - // - DPRINT1("CUSBDevice::CommitSetupPacket> no queue!!!\n"); - return STATUS_UNSUCCESSFUL; - } - - // - // build usb request - // - Status = m_Queue->CreateUSBRequest(&Request); - if (!NT_SUCCESS(Status)) - { - // - // failed to build request - // - DPRINT1("CUSBDevice::CommitSetupPacket> CreateUSBRequest failed with %x\n", Status); - return Status; - } - - /* FIXME build MDL */ - - // - // initialize request - // - Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, BufferLength, Mdl); - if (!NT_SUCCESS(Status)) - { - // - // failed to initialize request - // - DPRINT1("CUSBDevice::CommitSetupPacket> failed to initialize usb request with %x\n", Status); - Request->Release(); - return Status; - } - - // - // is a irp or event provided ? - // - if (Irp == NULL && pEvent == NULL) - { - // - // no completion details provided, requestor wants synchronized - // - KeInitializeEvent(&Event, NotificationEvent, FALSE); - pEvent = &Event; - Wait = TRUE; - } - - // - // set completion details - // - Status = Request->SetCompletionEvent(pEvent); - if (!NT_SUCCESS(Status)) - { - // - // failed to set completion details - // - DPRINT1("CUSBDevice::CommitSetupPacket> failed to set completion details with %x\n", Status); - Request->Release(); - return Status; - } - - // - // now add the request - // - Status = m_Queue->AddUSBRequest(Request); - if (!NT_SUCCESS(Status)) - { - // - // failed to add request - // - DPRINT1("CUSBDevice::CommitSetupPacket> failed add request to queue with %x\n", Status); - Request->Release(); - return Status; - } - - if (Wait) - { - // - // wait for the operation to complete - // - KeWaitForSingleObject(pEvent, Executive, KernelMode, FALSE, NULL); - } - - //TODO: - // Get result code from operation - // - - // - // returns the result code when the operation has been finished - // - //Status = Request->GetResultCode(); - - // - // release request - // - Request->Release(); - - // - // done - // - return Status; -} + //---------------------------------------------------------------------------------------- NTSTATUS CreateUSBDevice( Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Tue Apr 19 18:35:40 2011 @@ -38,12 +38,14 @@ // IUSBRequest interface functions virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp); - virtual NTSTATUS SetCompletionEvent(IN PKEVENT Event); - virtual VOID CompletionCallback(IN NTSTATUS NtStatusCode, IN ULONG UrbStatusCode); - virtual VOID CancelCallback(IN NTSTATUS NtStatusCode); + 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); virtual NTSTATUS GetQueueHead(struct _QUEUE_HEAD ** OutHead); virtual BOOLEAN IsRequestComplete(); virtual ULONG GetTransferType(); + virtual VOID GetResultStatus(OUT OPTIONAL NTSTATUS *NtStatusCode, OUT OPTIONAL PULONG UrbStatusCode); + virtual BOOLEAN IsRequestInitialized(); + virtual BOOLEAN ShouldReleaseRequestAfterCompletion(); // local functions ULONG InternalGetTransferType(); @@ -60,17 +62,60 @@ protected: LONG m_Ref; + + // + // memory manager for allocating setup packet / queue head / transfer descriptors + // PDMAMEMORYMANAGER m_DmaManager; + + // + // caller provided irp packet containing URB request + // + PIRP m_Irp; + + // + // transfer buffer length + // + ULONG m_TransferBufferLength; + + // + // transfer buffer MDL + // + PMDL m_TransferBufferMDL; + + + // + // caller provided setup packet + // PUSB_DEFAULT_PIPE_SETUP_PACKET m_SetupPacket; - ULONG m_TransferBufferLength; - PMDL m_TransferBufferMDL; - PIRP m_Irp; + + // + // completion event for callers who initialized request with setup packet + // PKEVENT m_CompletionEvent; + // + // DMA queue head + // PQUEUE_HEAD m_QueueHead; + + // + // DMA transfer descriptors linked to the queue head + // PQUEUE_TRANSFER_DESCRIPTOR m_TransferDescriptors[3]; + + // + // allocated setup packet from the DMA pool + // PUSB_DEFAULT_PIPE_SETUP_PACKET m_DescriptorPacket; PHYSICAL_ADDRESS m_DescriptorSetupPacket; + + // + // stores the result of the operation + // + NTSTATUS m_NtStatusCode; + ULONG m_UrbStatusCode; + }; //---------------------------------------------------------------------------------------- @@ -106,6 +151,23 @@ m_TransferBufferMDL = TransferBuffer; // + // allocate completion event + // + m_CompletionEvent = (PKEVENT)ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_USBEHCI); + if (!m_CompletionEvent) + { + // + // failed to allocate completion event + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize completion event + // + KeInitializeEvent(m_CompletionEvent, NotificationEvent, FALSE); + + // // done // return STATUS_SUCCESS; @@ -166,7 +228,7 @@ if (Urb->UrbBulkOrInterruptTransfer.TransferBufferLength) { // - // it must have an MDL + // FIXME: it must have an MDL // PC_ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); @@ -189,38 +251,27 @@ return STATUS_SUCCESS; } -//---------------------------------------------------------------------------------------- -NTSTATUS -CUSBRequest::SetCompletionEvent( - IN PKEVENT Event) -{ - if (m_QueueHead) - { - // - // WTF? operation is already in progress - // - return STATUS_UNSUCCESSFUL; - } - - // - // store completion event - // - m_CompletionEvent = Event; - - // - // done - // - return STATUS_SUCCESS; -} + //---------------------------------------------------------------------------------------- VOID CUSBRequest::CompletionCallback( IN NTSTATUS NtStatusCode, - IN ULONG UrbStatusCode) + IN ULONG UrbStatusCode, + IN struct _QUEUE_HEAD *QueueHead) { PIO_STACK_LOCATION IoStack; PURB Urb; + // + // FIXME: support linked queue heads + // + + // + // store completion code + // + m_NtStatusCode = NtStatusCode; + m_UrbStatusCode = UrbStatusCode; + if (m_Irp) { // @@ -260,23 +311,33 @@ // IoCompleteRequest(m_Irp, IO_NO_INCREMENT); } - - if (m_CompletionEvent) - { - // - // FIXME: make sure the request was not split - // + else + { + // + // signal completion event + // + PC_ASSERT(m_CompletionEvent); KeSetEvent(m_CompletionEvent, 0, FALSE); } } //---------------------------------------------------------------------------------------- VOID CUSBRequest::CancelCallback( - IN NTSTATUS NtStatusCode) + IN NTSTATUS NtStatusCode, + IN struct _QUEUE_HEAD *QueueHead) { PIO_STACK_LOCATION IoStack; PURB Urb; + // + // FIXME: support linked queue heads + // + + // + // store cancelleation code + // + m_NtStatusCode = NtStatusCode; + if (m_Irp) { // @@ -306,12 +367,12 @@ // IoCompleteRequest(m_Irp, IO_NO_INCREMENT); } - - if (m_CompletionEvent) - { - // - // FIXME: make sure the request was not split - // + else + { + // + // signal completion event + // + PC_ASSERT(m_CompletionEvent); KeSetEvent(m_CompletionEvent, 0, FALSE); } } @@ -370,6 +431,7 @@ // // FIXME: check if request was split // + UNIMPLEMENTED return TRUE; } //---------------------------------------------------------------------------------------- @@ -451,7 +513,6 @@ NTSTATUS Status; ULONG NumTransferDescriptors, Index; PQUEUE_HEAD QueueHead; - // // first allocate the queue head @@ -802,3 +863,75 @@ return Status; } +//---------------------------------------------------------------------------------------- +VOID +CUSBRequest::GetResultStatus( + OUT OPTIONAL NTSTATUS * NtStatusCode, + OUT OPTIONAL PULONG UrbStatusCode) +{ + // + // sanity check + // + PC_ASSERT(m_CompletionEvent); + + // + // wait for the operation to complete + // + KeWaitForSingleObject(m_CompletionEvent, Executive, KernelMode, FALSE, NULL); + + // + // copy status + // + if (NtStatusCode) + { + *NtStatusCode = m_NtStatusCode; + } + + // + // copy urb status + // + if (UrbStatusCode) + { + *UrbStatusCode = m_UrbStatusCode; + } + +} + + +//----------------------------------------------------------------------------------------- +BOOLEAN +CUSBRequest::IsRequestInitialized() +{ + if (m_Irp || m_SetupPacket) + { + // + // request is initialized + // + return TRUE; + } + + // + // request is not initialized + // + return FALSE; +} + +//----------------------------------------------------------------------------------------- +BOOLEAN +CUSBRequest::ShouldReleaseRequestAfterCompletion() +{ + if (m_Irp) + { + // + // the request is completed, release it + // + return TRUE; + } + else + { + // + // created with an setup packet, don't release + // + return FALSE; + } +}

1 0

[jimtabor] 51405: [Win32k] - This should fix the dcattr leaked when deleting a DC, See bug 6119.
by jimtabor＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: jimtabor Date: Tue Apr 19 18:18:19 2011 New Revision: 51405 URL: http://svn.reactos.org/svn/reactos?rev=51405&view=rev Log: [Win32k] - This should fix the dcattr leaked when deleting a DC, See bug 6119. Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Tue Apr 19 18:18:19 2011 @@ -827,6 +827,8 @@ if (!IsObjectDead(hDC)) { + DC_vFreeDcAttr(DCToDelete); // Plug a leak see bug 6119! + if (!GDIOBJ_FreeObjByHandle(hDC, GDI_OBJECT_TYPE_DC)) { DPRINT1("DC_FreeDC failed\n");

1 0

[akhaldi] 51404: [CMAKE] * The cmake branch is so awesome you don't even need to manually translate addresses. Automagic usermode address translation brought to you by the Arty.
by akhaldi＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: akhaldi Date: Tue Apr 19 18:13:10 2011 New Revision: 51404 URL: http://svn.reactos.org/svn/reactos?rev=51404&view=rev Log: [CMAKE] * The cmake branch is so awesome you don't even need to manually translate addresses. Automagic usermode address translation brought to you by the Arty. Added: branches/cmake-bringup/lib/rossym/iofile.c (with props) Modified: branches/cmake-bringup/include/reactos/rossym.h branches/cmake-bringup/lib/rossym/CMakeLists.txt branches/cmake-bringup/lib/rossym/initkm.c branches/cmake-bringup/lib/rossym/rossympriv.h branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/ntoskrnl/cache/section/io.c branches/cmake-bringup/ntoskrnl/cache/section/newmm.h branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c Modified: branches/cmake-bringup/include/reactos/rossym.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/r… ============================================================================== --- branches/cmake-bringup/include/reactos/rossym.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/rossym.h [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -24,6 +24,11 @@ BOOLEAN (*SeekFileProc)(PVOID FileContext, ULONG_PTR Position); } ROSSYM_CALLBACKS, *PROSSYM_CALLBACKS; +typedef struct _ROSSYM_OWN_FILECONTEXT { + BOOLEAN (*ReadFileProc)(PVOID FileContext, PVOID Buffer, ULONG Size); + BOOLEAN (*SeekFileProc)(PVOID FileContext, ULONG_PTR Position); +} ROSSYM_OWN_FILECONTEXT, *PROSSYM_OWN_FILECONTEXT; + struct Dwarf; typedef struct Dwarf *PROSSYM_INFO; Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -16,6 +16,7 @@ dwarfpubnames.c find.c fromfile.c + iofile.c init.c initkm.c initum.c Modified: branches/cmake-bringup/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/initkm… ============================================================================== --- branches/cmake-bringup/lib/rossym/initkm.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/initkm.c [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -38,8 +38,8 @@ { RosSymAllocMemKM, RosSymFreeMemKM, - RosSymZwReadFile, - RosSymZwSeekFile + RosSymIoReadFile, + RosSymIoSeekFile }; RosSymInit(&KmCallbacks); Added: branches/cmake-bringup/lib/rossym/iofile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/iofile… ============================================================================== --- branches/cmake-bringup/lib/rossym/iofile.c (added) +++ branches/cmake-bringup/lib/rossym/iofile.c [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -1,0 +1,34 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/rossym/zwfile.c + * PURPOSE: File I/O using native functions + * + * PROGRAMMERS: Ge van Geldorp (gvg(a)reactos.com) + */ + +#define NTOSAPI +#include <ntddk.h> +#include <reactos/rossym.h> +#include "rossympriv.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS RosSymStatus; + +BOOLEAN +RosSymIoReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) +{ + PROSSYM_OWN_FILECONTEXT OwnContext = (PROSSYM_OWN_FILECONTEXT)FileContext; + return OwnContext->ReadFileProc(FileContext, Buffer, Size); +} + +BOOLEAN +RosSymIoSeekFile(PVOID FileContext, ULONG_PTR Position) +{ + PROSSYM_OWN_FILECONTEXT OwnContext = (PROSSYM_OWN_FILECONTEXT)FileContext; + return OwnContext->SeekFileProc(FileContext, Position); +} + +/* EOF */ Propchange: branches/cmake-bringup/lib/rossym/iofile.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/lib/rossym/rossympriv.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/rossym… ============================================================================== --- branches/cmake-bringup/lib/rossym/rossympriv.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/rossympriv.h [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -19,6 +19,9 @@ extern BOOLEAN RosSymZwReadFile(PVOID FileContext, PVOID Buffer, ULONG Size); extern BOOLEAN RosSymZwSeekFile(PVOID FileContext, ULONG_PTR Position); +extern BOOLEAN RosSymIoReadFile(PVOID FileContext, PVOID Buffer, ULONG Size); +extern BOOLEAN RosSymIoSeekFile(PVOID FileContext, ULONG_PTR Position); + #define ROSSYM_IS_VALID_DOS_HEADER(DosHeader) (IMAGE_DOS_SIGNATURE == (DosHeader)->e_magic \ && 0L != (DosHeader)->e_lfanew) #define ROSSYM_IS_VALID_NT_HEADERS(NtHeaders) (IMAGE_NT_SIGNATURE == (NtHeaders)->Signature \ Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -32,7 +32,6 @@ cache/pinsup.c cache/section/data.c cache/section/fault.c - cache/section/io.c cache/section/reqtools.c cache/section/sptab.c cache/section/swapout.c) @@ -47,6 +46,7 @@ endif() list(APPEND SOURCE + cache/section/io.c config/cmalloc.c config/cmapi.c config/cmboot.c Modified: branches/cmake-bringup/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/cache/se… ============================================================================== --- branches/cmake-bringup/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/cache/section/io.c [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -99,6 +99,7 @@ PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, + BOOLEAN Paging, PIO_STATUS_BLOCK ReadStatus) { NTSTATUS Status; @@ -127,7 +128,7 @@ Length); KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); - + Irp = IoBuildAsynchronousFsdRequest (IRP_MJ_READ, DeviceObject, @@ -141,7 +142,7 @@ return STATUS_NO_MEMORY; } - Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; + Irp->Flags |= (Paging ? IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE : 0) | IRP_SYNCHRONOUS_API; Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -150,7 +151,8 @@ IrpSp->Control |= SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; IrpSp->FileObject = FileObject; IrpSp->CompletionRoutine = MiSimpleReadComplete; - + ObReferenceObject(FileObject); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { Modified: branches/cmake-bringup/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/cache/se… ============================================================================== --- branches/cmake-bringup/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/cache/section/newmm.h [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -181,6 +181,7 @@ PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, + BOOLEAN Paging, PIO_STATUS_BLOCK ReadStatus); NTSTATUS @@ -404,40 +405,6 @@ ULONG AllocationAttributes, PFILE_OBJECT FileObject); -NTSTATUS -NTAPI -MiSimpleRead -(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - PVOID Buffer, - ULONG Length, - PIO_STATUS_BLOCK ReadStatus); - -NTSTATUS -NTAPI -_MiSimpleWrite -(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - PVOID Buffer, - ULONG Length, - PIO_STATUS_BLOCK ReadStatus, - const char *file, - int line); - -#define MiSimpleWrite(F,O,B,L,R) _MiSimpleWrite(F,O,B,L,R,__FILE__,__LINE__) - -NTSTATUS -NTAPI -_MiWriteBackPage -(PFILE_OBJECT FileObject, - PLARGE_INTEGER Offset, - ULONG Length, - PFN_NUMBER Page, - const char *File, - int Line); - -#define MiWriteBackPage(F,O,L,P) _MiWriteBackPage(F,O,L,P,__FILE__,__LINE__) - PVOID NTAPI MmGetSegmentRmap(PFN_NUMBER Page, PULONG RawOffset); Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Tue Apr 19 18:13:10 2011 @@ -12,7 +12,8 @@ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG +#include "../cache/section/newmm.h" #include <debug.h> /* GLOBALS ******************************************************************/ @@ -25,6 +26,12 @@ PROSSYM_INFO RosSymInfo; } IMAGE_SYMBOL_INFO_CACHE, *PIMAGE_SYMBOL_INFO_CACHE; + +typedef struct _ROSSYM_KM_OWN_CONTEXT { + ROSSYM_OWN_FILECONTEXT Rossym; + LARGE_INTEGER FileOffset; + PFILE_OBJECT FileObject; +} ROSSYM_KM_OWN_CONTEXT, *PROSSYM_KM_OWN_CONTEXT; static BOOLEAN LoadSymbols; static LIST_ENTRY SymbolFileListHead; @@ -34,6 +41,50 @@ BOOLEAN KdbpSymbolsInitialized = FALSE; /* FUNCTIONS ****************************************************************/ + +static BOOLEAN +KdbpSeekSymFile(PVOID FileContext, ULONG_PTR Target) +{ + PROSSYM_KM_OWN_CONTEXT Context = (PROSSYM_KM_OWN_CONTEXT)FileContext; + Context->FileOffset.QuadPart = Target; + return TRUE; +} + +static BOOLEAN +KdbpReadSymFile(PVOID FileContext, PVOID Buffer, ULONG Length) +{ + PROSSYM_KM_OWN_CONTEXT Context = (PROSSYM_KM_OWN_CONTEXT)FileContext; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status = MiSimpleRead + (Context->FileObject, + &Context->FileOffset, + Buffer, + Length, + FALSE, + &Iosb); + return NT_SUCCESS(Status); +} + +static PROSSYM_OWN_FILECONTEXT +KdbpCaptureFileForSymbols(PFILE_OBJECT FileObject) +{ + PROSSYM_KM_OWN_CONTEXT Context = ExAllocatePool(NonPagedPool, sizeof(*Context)); + if (!Context) return NULL; + ObReferenceObject(FileObject); + Context->FileOffset.QuadPart = 0; + Context->FileObject = FileObject; + Context->Rossym.ReadFileProc = KdbpReadSymFile; + Context->Rossym.SeekFileProc = KdbpSeekSymFile; + return &Context->Rossym; +} + +static VOID +KdbpReleaseFileForSymbols(PROSSYM_OWN_FILECONTEXT FileContext) +{ + PROSSYM_KM_OWN_CONTEXT Context = (PROSSYM_KM_OWN_CONTEXT)FileContext; + ObDereferenceObject(Context->FileObject); + ExFreePool(Context); +} static BOOLEAN KdbpSymSearchModuleList( @@ -127,12 +178,9 @@ IN PVOID Address) { PMEMORY_AREA MemoryArea = NULL; - HANDLE FileHandle = NULL; PROS_SECTION_OBJECT SectionObject; PLDR_DATA_TABLE_ENTRY LdrEntry; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING ModuleFileName; + PROSSYM_OWN_FILECONTEXT FileContext; ULONG_PTR RelativeAddress; NTSTATUS Status; ULONG LineNumber; @@ -163,44 +211,22 @@ } SectionObject = MemoryArea->Data.SectionData.Section; if (!(SectionObject->AllocationAttributes & SEC_IMAGE)) goto end; - if (SectionObject->ImageSection->ImageBase != KdbpImageBase) + if (MemoryArea->StartingAddress != KdbpImageBase) { if (KdbpRosSymInfo) { RosSymDelete(KdbpRosSymInfo); KdbpRosSymInfo = NULL; + KdbpImageBase = 0; } - Status = MmGetFileNameForAddress(Address, &ModuleFileName); - if (!NT_SUCCESS(Status)) - goto end; - - InitializeObjectAttributes - (&ObjectAttributes, - &ModuleFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - if (!NT_SUCCESS - (ZwOpenFile - (&FileHandle, - FILE_READ_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT))) + if ((FileContext = KdbpCaptureFileForSymbols(SectionObject->FileObject))) { - goto end; + if (RosSymCreateFromFile(FileContext, &KdbpRosSymInfo)) + KdbpImageBase = MemoryArea->StartingAddress; + + KdbpReleaseFileForSymbols(FileContext); } - - if (!RosSymCreateFromFile(&FileHandle, &KdbpRosSymInfo)) - { - KdbpRosSymInfo = NULL; - } - - ZwClose(FileHandle); - KdbpImageBase = SectionObject->ImageSection->ImageBase; } if (KdbpRosSymInfo) @@ -402,6 +428,8 @@ HANDLE FileHandle; NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; + PFILE_OBJECT FileObject; + PROSSYM_OWN_FILECONTEXT FileContext; /* Allow KDB to break on module load */ KdbModuleLoaded(FileName); @@ -423,7 +451,7 @@ /* Open the file */ InitializeObjectAttributes(&ObjectAttributes, FileName, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -443,20 +471,34 @@ DPRINT("Loading symbols from %wZ...\n", FileName); - if (!RosSymCreateFromFile(&FileHandle, RosSymInfo)) - { - DPRINT("Failed to load symbols from %wZ\n", FileName); + Status = ObReferenceObjectByHandle + (FileHandle, + FILE_READ_DATA|SYNCHRONIZE, + NULL, + KernelMode, + (PVOID*)&FileObject, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT("Could not get the file object\n"); + ZwClose(FileHandle); return; } + if ((FileContext = KdbpCaptureFileForSymbols(FileObject))) + { + if (RosSymCreateFromFile(FileContext, RosSymInfo)) + { + /* add file to cache */ + KdbpSymAddCachedFile(FileName, *RosSymInfo); + DPRINT("Installed symbols: %wZ %p\n", FileName, *RosSymInfo); + } + KdbpReleaseFileForSymbols(FileContext); + } + + ObDereferenceObject(FileObject); ZwClose(FileHandle); - - DPRINT("Symbols loaded.\n"); - - /* add file to cache */ - KdbpSymAddCachedFile(FileName, *RosSymInfo); - - DPRINT("Installed symbols: %wZ %p\n", FileName, *RosSymInfo); } VOID

1 0

[jimtabor] 51403: [Win32k] - Replace patch point for forced DC removal. See bug 6119.
by jimtabor＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: jimtabor Date: Tue Apr 19 17:18:05 2011 New Revision: 51403 URL: http://svn.reactos.org/svn/reactos?rev=51403&view=rev Log: [Win32k] - Replace patch point for forced DC removal. See bug 6119. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Tue Apr 19 17:18:05 2011 @@ -868,6 +868,10 @@ Entry->UserData = NULL; } break; + + case GDI_OBJECT_TYPE_DC: +// DC_FreeDcAttr(hObject); + break; } return NULL != hObject

1 0

[mjmartin] 51402: [USBEHCI_NEW] - Initialize the MemoryManager only after allocating a CommonBuffer to pass to it. - Create a QueueHead to put into the AsyncList Register.
by mjmartin＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: mjmartin Date: Tue Apr 19 15:06:26 2011 New Revision: 51402 URL: http://svn.reactos.org/svn/reactos?rev=51402&view=rev Log: [USBEHCI_NEW] - Initialize the MemoryManager only after allocating a CommonBuffer to pass to it. - Create a QueueHead to put into the AsyncList Register. Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Tue Apr 19 15:06:26 2011 @@ -97,8 +97,10 @@ EHCI_CAPS m_Capabilities; USHORT m_VendorID; USHORT m_DeviceID; + PQUEUE_HEAD AsyncQueueHead; PUSBQUEUE m_UsbQueue; PDMAMEMORYMANAGER m_MemoryManager; + VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); @@ -155,16 +157,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create UsbQueue!\n"); - return Status; - } - - // - // Initialize the DMAMemoryManager - // - Status = m_MemoryManager->Initialize(this, &m_Lock, PAGE_SIZE * 4, VirtualBase, PhysicalAddress, 32); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize the DMAMemoryManager\n"); return Status; } @@ -250,6 +242,7 @@ ULONG Index, Count; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; DEVICE_DESCRIPTION DeviceDescription; + PHYSICAL_ADDRESS AsyncPhysicalAddress; PVOID ResourceBase; NTSTATUS Status; @@ -383,6 +376,16 @@ return Status; // + // Initialize the DMAMemoryManager + // + Status = m_MemoryManager->Initialize(this, &m_Lock, PAGE_SIZE * 4, VirtualBase, PhysicalAddress, 32); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize the DMAMemoryManager\n"); + return Status; + } + + // // Initialize the UsbQueue now that we have an AdapterObject. // Status = m_UsbQueue->Initialize(PUSBHARDWAREDEVICE(this), m_Adapter, NULL); @@ -392,10 +395,29 @@ return Status; } + // + // Create a queuehead for the Async Register + // + m_MemoryManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&AsyncQueueHead, &AsyncPhysicalAddress); + + AsyncQueueHead->AlternateNextPointer = TERMINATE_POINTER; + AsyncQueueHead->NextPointer = TERMINATE_POINTER; + AsyncQueueHead->PhysicalAddr = AsyncPhysicalAddress.LowPart; + AsyncQueueHead->HorizontalLinkPointer = AsyncQueueHead->PhysicalAddr | QH_TYPE_QH; + AsyncQueueHead->EndPointCharacteristics.QEDTDataToggleControl = FALSE; + AsyncQueueHead->Token.Bits.InterruptOnComplete = FALSE; + AsyncQueueHead->EndPointCharacteristics.HeadOfReclamation = TRUE; + AsyncQueueHead->Token.Bits.Halted = TRUE; + AsyncQueueHead->EndPointCharacteristics.MaximumPacketLength = 64; + AsyncQueueHead->EndPointCharacteristics.NakCountReload = 0xF; + AsyncQueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; + AsyncQueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x03; + + SetAsyncListRegister(AsyncQueueHead->PhysicalAddr); + // // Start the controller // - DPRINT1("Starting Controller\n"); return StartController(); } Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Tue Apr 19 15:06:26 2011 @@ -93,9 +93,6 @@ // KeInitializeSpinLock(&m_Lock); - // - // FIXME: Need to set AsyncRegister with a QUEUEHEAD - // return Status; }

1 0

[mjmartin] 51401: [USBEHCI_NEW] - hub_controller: Implement Status Change Endpoint for RootHub. Handling the URB can return STATUS_PENDING, as in the new SCE code. Check for this before completing ...
by mjmartin＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: mjmartin Date: Tue Apr 19 13:57:32 2011 New Revision: 51401 URL: http://svn.reactos.org/svn/reactos?rev=51401&view=rev Log: [USBEHCI_NEW] - hub_controller: Implement Status Change Endpoint for RootHub. Handling the URB can return STATUS_PENDING, as in the new SCE code. Check for this before completing the Irp. Uncomment calls to PortStatus, SetPortFeature, and ClearPortStatus now that they are implemented. - For function receiving a port number check that its not larger than the actual number of ports on the controller. Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Tue Apr 19 13:57:32 2011 @@ -602,6 +602,9 @@ { ULONG PortStatus; + if (PortIndex > m_Capabilities.HCSParams.PortCount) + return STATUS_UNSUCCESSFUL; + PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) { @@ -640,7 +643,8 @@ return STATUS_SUCCESS; } -NTSTATUS CUSBHardwareDevice::GetPortStatus( +NTSTATUS +CUSBHardwareDevice::GetPortStatus( ULONG PortId, OUT USHORT *PortStatus, OUT USHORT *PortChange) @@ -648,6 +652,11 @@ ULONG Value; USHORT Status = 0, Change = 0; + DPRINT1("CUSBHardwareDevice::GetPortStatus\n"); + + if (PortId > m_Capabilities.HCSParams.PortCount) + return STATUS_UNSUCCESSFUL; + // // Get the value of the Port Status and Control Register // @@ -703,15 +712,27 @@ if (Value & EHCI_PRT_ENABLEDSTATUSCHANGE) Change |= USB_PORT_STATUS_ENABLE; + *PortStatus = Status; + *PortChange = Change; + + //HACK: Maybe + if (Status == (USB_PORT_STATUS_HIGH_SPEED | USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_POWER)) + *PortChange = USB_PORT_STATUS_CONNECT; return STATUS_SUCCESS; } -NTSTATUS CUSBHardwareDevice::ClearPortStatus( +NTSTATUS +CUSBHardwareDevice::ClearPortStatus( ULONG PortId, ULONG Status) { ULONG Value; + + DPRINT1("CUSBHardwareDevice::ClearPortStatus\n"); + + if (PortId > m_Capabilities.HCSParams.PortCount) + return STATUS_UNSUCCESSFUL; Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); @@ -737,18 +758,26 @@ } -NTSTATUS CUSBHardwareDevice::SetPortFeature( +NTSTATUS +CUSBHardwareDevice::SetPortFeature( ULONG PortId, ULONG Feature) { ULONG Value; + DPRINT1("CUSBHardwareDevice::SetPortFeature\n"); + + if (PortId > m_Capabilities.HCSParams.PortCount) + return STATUS_UNSUCCESSFUL; + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + if (Feature == PORT_ENABLE) { // // FIXME: EHCI Ports can only be disabled via reset // + DPRINT1("PORT_ENABLE not supported for EHCI\n"); } if (Feature == PORT_RESET) @@ -757,7 +786,6 @@ { DPRINT1("Non HighSpeed device. Releasing Ownership\n"); } - // // Reset and clean enable // @@ -769,17 +797,21 @@ } if (Feature == PORT_POWER) - DPRINT1("Not implemented\n"); - - return STATUS_SUCCESS; -} - -VOID CUSBHardwareDevice::SetAsyncListRegister(ULONG PhysicalAddress) + DPRINT1("PORT_POWER Not implemented\n"); + + return STATUS_SUCCESS; +} + +VOID +CUSBHardwareDevice::SetAsyncListRegister( + ULONG PhysicalAddress) { EHCI_WRITE_REGISTER_ULONG(EHCI_ASYNCLISTBASE, PhysicalAddress); } -VOID CUSBHardwareDevice::SetPeriodicListRegister(ULONG PhysicalAddress) +VOID +CUSBHardwareDevice::SetPeriodicListRegister( + ULONG PhysicalAddress) { EHCI_WRITE_REGISTER_ULONG(EHCI_PERIODICLISTBASE, PhysicalAddress); } Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Tue Apr 19 13:57:32 2011 @@ -90,6 +90,7 @@ RTL_BITMAP m_DeviceAddressBitmap; PULONG m_DeviceAddressBitmapBuffer; LIST_ENTRY m_UsbDeviceList; + PIRP m_PendingSCEIrp; }; typedef struct @@ -692,6 +693,60 @@ IN OUT PIRP Irp, PURB Urb) { + ULONG PortCount, PortId; + USHORT PortStatus, PortChange; + + // + // First check if the request is for the Status Change Endpoint + // + + // + // Is the Request for the root hub + // + if (Urb->UrbHeader.UsbdDeviceHandle==0) + { + // + // There should only be one SCE request pending at a time + // + ASSERT (m_PendingSCEIrp == NULL); + + // + // Get the number of ports and check each one for device connected + // + m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); + DPRINT1("SCE Request\n"); + DPRINT1("PortCount %d\n", PortCount); + ((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 0; + for (PortId = 0; PortId < PortCount; PortId++) + { + m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); + + DPRINT1("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); + + // + // FIXME: Verify that this is correct. + // + if ((PortStatus & USB_PORT_STATUS_CONNECT) && (PortChange & USB_PORT_STATUS_CONNECT)) + { + DPRINT1("Device is connected on port %d\n", PortId); + ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((PortId + 1) & 7); + break; + } + } + + // + // If there were changes then return SUCCESS + // + if (((PULONG)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] != 0) + return STATUS_SUCCESS; + + // + // Else pend the IRP, to be completed when a device connects or disconnects. + // + m_PendingSCEIrp = Irp; + IoMarkIrpPending(Irp); + return STATUS_PENDING; + } UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; } @@ -743,9 +798,8 @@ // // get port status // - //Status = m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); - - Status = STATUS_SUCCESS; + Status = m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); + if (NT_SUCCESS(Status)) { // @@ -771,10 +825,10 @@ switch (Urb->UrbControlVendorClassRequest.Value) { case C_PORT_CONNECTION: - //Status = m_Hardware->ClearPortStatus(PortId, C_PORT_CONNECTION); + Status = m_Hardware->ClearPortStatus(PortId, C_PORT_CONNECTION); break; case C_PORT_RESET: - //Status= m_Hardware->ClearPortStatus(PortId, C_PORT_RESET); + Status= m_Hardware->ClearPortStatus(PortId, C_PORT_RESET); break; default: DPRINT("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); @@ -806,7 +860,7 @@ // // set suspend port feature // - Status = STATUS_SUCCESS; //m_Hardware->SetPortFeature(PortId, PORT_SUSPEND); + Status = m_Hardware->SetPortFeature(PortId, PORT_SUSPEND); break; } case PORT_POWER: @@ -814,7 +868,7 @@ // // set power feature on port // - Status = STATUS_SUCCESS; //m_Hardware->SetPortFeature(PortId, PORT_POWER); + Status = m_Hardware->SetPortFeature(PortId, PORT_POWER); break; } @@ -1232,9 +1286,12 @@ break; } } - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + return Status; } Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Tue Apr 19 13:57:32 2011 @@ -70,6 +70,7 @@ PQUEUE_HEAD m_QueueHead; PQUEUE_TRANSFER_DESCRIPTOR m_TransferDescriptors[3]; PUSB_DEFAULT_PIPE_SETUP_PACKET m_DescriptorPacket; + PHYSICAL_ADDRESS m_DescriptorSetupPacket; }; //---------------------------------------------------------------------------------------- @@ -570,14 +571,15 @@ } // - // FIXME: where put MDL virtual address? - // - - - // - // link setup packet into buffer - VIRTUAL Address!!! - // - m_TransferDescriptors[0]->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorPacket); + // Control Transfers have only one in or out buffer if one at all. Put in the QueueHead the + // same as BulkTransfers. USBQueue will use the Mdl to fill in the BufferPointers + // + QueueHead->Mdl = m_TransferBufferMDL; + + // + // link setup packet into buffer - Physical Address!!! + // + m_TransferDescriptors[0]->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); // // link transfer descriptors to queue head @@ -791,6 +793,7 @@ // copy setup packet // RtlCopyMemory(m_DescriptorPacket, m_SetupPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + m_DescriptorSetupPacket = PhysicalAddress; } //

1 0

[ilardig] 51400: [winetests] Add new lines to test results for kernel32/dosdev.c
by ilardig＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: ilardig Date: Tue Apr 19 09:15:05 2011 New Revision: 51400 URL: http://svn.reactos.org/svn/reactos?rev=51400&view=rev Log: [winetests] Add new lines to test results for kernel32/dosdev.c Modified: trunk/rostests/winetests/kernel32/dosdev.c Modified: trunk/rostests/winetests/kernel32/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/dosdev… ============================================================================== --- trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] Tue Apr 19 09:15:05 2011 @@ -33,13 +33,13 @@ BOOL Result; Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive using lowercase drive letter"); + ok(Result, "Failed to subst drive using lowercase drive letter\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); - ok(Result, "Failed to remove subst drive using lowercase drive letter"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt"); + ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); + + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); } static void test_DefineDosDeviceA2(void) @@ -50,13 +50,13 @@ BOOL Result; Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(!Result, "Subst drive using trailing path seperator"); + ok(!Result, "Subst drive using trailing path seperator\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); - ok(!Result, "Subst drive using trailing path seperator"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present when it should not be created in the first place"); + ok(!Result, "Subst drive using trailing path seperator\n"); + + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(!Result, "Subst drive is present when it should not be created in the first place\n"); } static void test_DefineDosDeviceA3(void) @@ -67,13 +67,13 @@ BOOL Result; Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive using non-DOS drive name"); + ok(Result, "Failed to subst drive using non-DOS drive name\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive using non-DOS drive name"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt"); + ok(Result, "Failed to subst drive using non-DOS drive name\n"); + + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); } static void test_DefineDosDeviceA4(void) @@ -84,13 +84,13 @@ BOOL Result; Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION, Drive, NULL); - ok(Result, "Failed to remove subst drive using NULL Target name"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt"); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); } static void test_DefineDosDeviceA5(void) @@ -101,31 +101,31 @@ BOOL Result; Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) + ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) + ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt"); + ok(Result, "Failed to remove subst drive\n"); + + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); } static void test_DefineDosDeviceA6(void) @@ -136,31 +136,31 @@ BOOL Result; Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp2") == 0), "Subst drive is not pointing to correct target"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) + ok((_stricmp(Target, "\\??\\C:\\temp2") == 0), "Subst drive is not pointing to correct target\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp1") == 0), "Subst drive is not pointing to correct target"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) + ok((_stricmp(Target, "\\??\\C:\\temp1") == 0), "Subst drive is not pointing to correct target\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt"); + ok(Result, "Failed to remove subst drive\n"); + + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); } static void test_DefineDosDeviceA7(void) @@ -171,49 +171,49 @@ BOOL Result; Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp4"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(0, Drive, "C:\\temp5"); - ok(Result, "Failed to subst drive"); + ok(Result, "Failed to subst drive\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp5") == 0), "Subst drive is not pointing to correct target"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) + ok((_stricmp(Target, "\\??\\C:\\temp5") == 0), "Subst drive is not pointing to correct target\n"); Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp5"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) + ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); + + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) + ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); + + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); if (Result) ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target"); - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target"); - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp4"); - ok(Result, "Failed to remove subst drive"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt"); + ok(Result, "Failed to remove subst drive\n"); + + Result = QueryDosDeviceA(Drive, Target, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); } START_TEST(dosdev)

1 0

[ilardig] 51399: [win32csr/file.c] Add missing new lines to some DPRINT1
by ilardig＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: ilardig Date: Tue Apr 19 07:59:23 2011 New Revision: 51399 URL: http://svn.reactos.org/svn/reactos?rev=51399&view=rev Log: [win32csr/file.c] Add missing new lines to some DPRINT1 Modified: trunk/reactos/subsystems/win32/csrss/win32csr/file.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] Tue Apr 19 07:59:23 2011 @@ -82,7 +82,7 @@ Status = RtlEnterCriticalSection(&Win32CsrDefineDosDeviceCritSec); if (! NT_SUCCESS(Status)) { - DPRINT1("RtlEnterCriticalSection() failed (Status %lx)", + DPRINT1("RtlEnterCriticalSection() failed (Status %lx)\n", Status); return Status; } @@ -149,7 +149,7 @@ if (! NT_SUCCESS(Status)) { - DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed (Status %lx)", + DPRINT1("NtQuerySymbolicLinkObject(%wZ) failed (Status %lx)\n", &DeviceName, Status); _SEH2_LEAVE; } @@ -270,7 +270,7 @@ Status = NtMakeTemporaryObject(LinkHandle); if (! NT_SUCCESS(Status)) { - DPRINT1("NtMakeTemporaryObject(%wZ) failed (Status %lx)", + DPRINT1("NtMakeTemporaryObject(%wZ) failed (Status %lx)\n", &DeviceName, Status); _SEH2_LEAVE; } @@ -279,7 +279,7 @@ LinkHandle = NULL; if (! NT_SUCCESS(Status)) { - DPRINT1("NtClose(%wZ) failed (Status %lx)", + DPRINT1("NtClose(%wZ) failed (Status %lx)\n", &DeviceName, Status); _SEH2_LEAVE; } @@ -396,7 +396,7 @@ SECURITY_DESCRIPTOR_REVISION); if (! NT_SUCCESS(Status)) { - DPRINT1("RtlCreateSecurityDescriptor() failed (Status %lx)", + DPRINT1("RtlCreateSecurityDescriptor() failed (Status %lx)\n", Status); _SEH2_LEAVE; } @@ -406,7 +406,7 @@ ACL_REVISION); if (! NT_SUCCESS(Status)) { - DPRINT1("RtlCreateAcl() failed (Status %lx)", + DPRINT1("RtlCreateAcl() failed (Status %lx)\n", Status); _SEH2_LEAVE; } @@ -430,7 +430,7 @@ FALSE); if (! NT_SUCCESS(Status)) { - DPRINT1("RtlSetDaclSecurityDescriptor() failed (Status %lx)", + DPRINT1("RtlSetDaclSecurityDescriptor() failed (Status %lx)\n", Status); _SEH2_LEAVE; } @@ -449,13 +449,13 @@ Status = NtMakePermanentObject(LinkHandle); if (! NT_SUCCESS(Status)) { - DPRINT1("NtMakePermanentObject(%wZ) failed (Status %lx)", + DPRINT1("NtMakePermanentObject(%wZ) failed (Status %lx)\n", &DeviceName, Status); } } else { - DPRINT1("NtCreateSymbolicLinkObject(%wZ) failed (Status %lx)", + DPRINT1("NtCreateSymbolicLinkObject(%wZ) failed (Status %lx)\n", &DeviceName, Status); } }

1 0

[mjmartin] 51398: [USBEHCI_NEW] - Forgotten changes in r51397.
by mjmartin＠svn.reactos.org 19 Apr '11

19 Apr '11

Author: mjmartin Date: Tue Apr 19 07:36:44 2011 New Revision: 51398 URL: http://svn.reactos.org/svn/reactos?rev=51398&view=rev Log: [USBEHCI_NEW] - Forgotten changes in r51397. Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Tue Apr 19 07:36:44 2011 @@ -209,7 +209,31 @@ // virtual NTSTATUS ResetPort(ULONG PortNumber) = 0; - + +//----------------------------------------------------------------------------------------- +// +// GetPortStatus +// +// Description: this functions return status and change state of port +// + virtual NTSTATUS GetPortStatus(ULONG PortId, OUT USHORT *PortStatus, OUT USHORT *PortChange) = 0; + +//----------------------------------------------------------------------------------------- +// +// ClearPortStatus +// +// Description: Clears Status of Port, for example Connection, Enable and Reset +// + virtual NTSTATUS ClearPortStatus(ULONG PortId, ULONG Status) = 0; + +//----------------------------------------------------------------------------------------- +// +// SetPortFeature +// +// Description: this functions Sets Feature on Port, for example Enable, Power and Reset +// + virtual NTSTATUS SetPortFeature(ULONG PortId, ULONG Feature) = 0; + //----------------------------------------------------------------------------------------- // // SetAsyncListRegister

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs