Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-14 07:28:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBEHCI]

Browse source 
- Remove assertion which no longer holds
- Delete old queue head after a new queue head has been sucessfully fetched 

svn path=/trunk/; revision=55691
This commit is contained in:
Johannes Anderwald 2012-02-19 00:16:50 +00:00
parent 727c97602e
commit 6e38e0e13c
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/drivers/usb/usbehci/usb_queue.cpp
View file

@ -769,16 +769,16 @@ CUSBQueue::QueueHeadCleanup(
// //
if ((Request->IsRequestComplete() == FALSE) && (UrbStatus == USBD_STATUS_SUCCESS)) if ((Request->IsRequestComplete() == FALSE) && (UrbStatus == USBD_STATUS_SUCCESS))
{ {
//
// let IUSBRequest free the queue head
//
Request->FreeQueueHead(CurrentQH);
// //
// request is incomplete, get new queue head // request is incomplete, get new queue head
// //
if (Request->GetQueueHead(&NewQueueHead) == STATUS_SUCCESS) if (Request->GetQueueHead(&NewQueueHead) == STATUS_SUCCESS)
{ {
//
// let IUSBRequest free the queue head
//
Request->FreeQueueHead(CurrentQH);
// //
// first acquire request lock // first acquire request lock
// //

6
reactos/drivers/usb/usbehci/usb_request.cpp
View file

@ -732,7 +732,6 @@ CUSBRequest::InitDescriptor(
*OutDescriptorLength = Length; *OutDescriptorLength = Length;
} }
NTSTATUS NTSTATUS
CUSBRequest::BuildTransferDescriptorChain( CUSBRequest::BuildTransferDescriptorChain(
IN PQUEUE_HEAD QueueHead, IN PQUEUE_HEAD QueueHead,
@ -1192,11 +1191,6 @@ CUSBRequest::BuildBulkTransferQueueHead(
&m_EndpointDescriptor->DataToggle, &m_EndpointDescriptor->DataToggle,
&ChainDescriptorLength); &ChainDescriptorLength);
//
// FIXME: handle errors
//
//ASSERT(ChainDescriptorLength == m_TransferBufferLength);
// //
// move to next offset // move to next offset
// //