Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 51507: [USBEHCI_NEW] - Silence usb bulk control traces
by janderwald＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: janderwald Date: Sat Apr 30 18:46:10 2011 New Revision: 51507 URL: http://svn.reactos.org/svn/reactos?rev=51507&view=rev Log: [USBEHCI_NEW] - Silence usb bulk control traces 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_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] Sat Apr 30 18:46:10 2011 @@ -774,7 +774,7 @@ { ULONG Value; - DPRINT1("CUSBHardwareDevice::ClearPortStatus\n"); + DPRINT("CUSBHardwareDevice::ClearPortStatus\n"); if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; @@ -818,7 +818,7 @@ { ULONG Value; - DPRINT1("CUSBHardwareDevice::SetPortFeature\n"); + DPRINT("CUSBHardwareDevice::SetPortFeature\n"); if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; 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] Sat Apr 30 18:46:10 2011 @@ -799,7 +799,7 @@ DPRINT1("Control Transfer is not expected!!!\n"); return STATUS_INVALID_DEVICE_REQUEST; case USB_ENDPOINT_TYPE_BULK: - DPRINT1("Initiating Bulk Transfer\n"); + DPRINT("Initiating Bulk Transfer\n"); break; case USB_ENDPOINT_TYPE_ISOCHRONOUS: case USB_ENDPOINT_TYPE_INTERRUPT: 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] Sat Apr 30 18:46:10 2011 @@ -98,7 +98,7 @@ { NTSTATUS Status = STATUS_SUCCESS; - DPRINT1("CUSBQueue::Initialize()\n"); + DPRINT("CUSBQueue::Initialize()\n"); ASSERT(Hardware); @@ -208,7 +208,7 @@ return Status; } - DPRINT1("Request %p QueueHead %p inserted into AsyncQueue\n", Request, QueueHead); + DPRINT("Request %p QueueHead %p inserted into AsyncQueue\n", Request, QueueHead); // // Add it to the pending list @@ -518,7 +518,7 @@ // IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead); - DPRINT1("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); + DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); // // check if queue head is complete @@ -550,7 +550,7 @@ OUT PULONG ShouldRingDoorBell) { - DPRINT1("CUSBQueue::InterruptCallback\n"); + DPRINT("CUSBQueue::InterruptCallback\n"); // // iterate asynchronous list @@ -666,7 +666,7 @@ PLIST_ENTRY Entry; PQUEUE_HEAD CurrentQH; - DPRINT1("CUSBQueue::CompleteAsyncRequests\n"); + DPRINT("CUSBQueue::CompleteAsyncRequests\n"); // // first acquire request lock 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] Sat Apr 30 18:46:10 2011 @@ -261,7 +261,7 @@ // // Create one using TransferBuffer // - DPRINT1("Creating Mdl from Urb Buffer %p Length %lu\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + DPRINT("Creating Mdl from Urb Buffer %p Length %lu\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); m_TransferBufferMDL = IoAllocateMdl(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, FALSE, @@ -384,7 +384,7 @@ Urb->UrbBulkOrInterruptTransfer.TransferBufferLength = InternalCalculateTransferLength(); } - DPRINT1("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x Transferred Length %lu\n", this, m_Irp, NtStatusCode, UrbStatusCode, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + DPRINT("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x Transferred Length %lu\n", this, m_Irp, NtStatusCode, UrbStatusCode, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); // // FIXME: check if the transfer was split @@ -521,7 +521,6 @@ // // FIXME: check if request was split // - UNIMPLEMENTED return TRUE; } //---------------------------------------------------------------------------------------- @@ -790,12 +789,12 @@ PC_ASSERT(Base); - DPRINT1("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); - DPRINT1("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); - - DPRINT1("Request %p Base Address %p TransferBytesLength %lu MDL %p\n", this, Base, BytesAvailable, m_TransferBufferMDL); - DPRINT1("InternalGetPidDirection() %d EndPointAddress %x\n", InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F); - DPRINT1("Irp %p QueueHead %p\n", m_Irp, QueueHead); + DPRINT("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); + DPRINT("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); + + DPRINT("Request %p Base Address %p TransferBytesLength %lu MDL %p\n", this, Base, BytesAvailable, m_TransferBufferMDL); + DPRINT("InternalGetPidDirection() %d EndPointAddress %x\n", InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F); + DPRINT("Irp %p QueueHead %p\n", m_Irp, QueueHead); //PC_ASSERT(InternalGetPidDirection() == USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); @@ -868,7 +867,7 @@ // BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; - DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); } else @@ -879,7 +878,7 @@ m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = BytesAvailable; BytesAvailable = 0; - DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); break; } @@ -913,7 +912,7 @@ // BytesAvailable -= PAGE_SIZE; - DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); } else @@ -938,7 +937,7 @@ // // done // - DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); break; @@ -1465,7 +1464,6 @@ // // release transfer descriptors // - DPRINT1("m_TransferDescriptor[0] Length %lu\n", m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer); m_DmaManager->Release(m_TransferDescriptors[0], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); m_TransferDescriptors[0] = 0; } 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] Sat Apr 30 18:46:10 2011 @@ -2,7 +2,7 @@ #define USBEHCI_H__ #include <ntddk.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <hubbusif.h> #include <usbbusif.h>

1 0

[janderwald] 51506: [USBEHCI_NEW] - Store number of bytes transferred in the transfer descriptors - Perform queue head completion when the door bell ring has been acknowledged. Fixes race condition...
by janderwald＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: janderwald Date: Sat Apr 30 17:44:43 2011 New Revision: 51506 URL: http://svn.reactos.org/svn/reactos?rev=51506&view=rev Log: [USBEHCI_NEW] - Store number of bytes transferred in the transfer descriptors - Perform queue head completion when the door bell ring has been acknowledged. Fixes race condition between multiple irps in the async list - Fix calculation of transfer length when the request is an bulk in operation - Use EndPointDescriptor member to access transfer type / pid direction - Use MmGetSystemAddressForMdlSafe to retrieve system address for urb buffer - Fix check if first transfer buffer finishes on first size if the size is of page_size - With these changes and little luck and good weather, usb mass storage devices have been seen to work in Windows XP SP3 - Code inspired of mjmartin usbehci driver and Haiku's usb stack Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Sat Apr 30 17:44:43 2011 @@ -127,6 +127,7 @@ //Software ULONG PhysicalAddr; LIST_ENTRY LinkedDescriptors; + ULONG TotalBytesToTransfer; } QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; // 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] Sat Apr 30 17:44:43 2011 @@ -52,6 +52,8 @@ PDMA_ADAPTER m_Adapter; PQUEUE_HEAD AsyncListQueueHead; LIST_ENTRY m_CompletedRequestAsyncList; + LIST_ENTRY m_PendingRequestAsyncList; + // queue head manipulation functions VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); @@ -119,6 +121,11 @@ // Initialize completed async list head // InitializeListHead(&m_CompletedRequestAsyncList); + + // + // Initialize pending async list head + // + InitializeListHead(&m_PendingRequestAsyncList); return Status; } @@ -425,16 +432,154 @@ NTSTATUS Status) { IUSBRequest *Request; + PQUEUE_HEAD NewQueueHead; + + // + // now unlink the queue head + // FIXME: implement chained queue heads + // + UnlinkQueueHead(CurrentQH); + + // + // get contained usb request + // + Request = (IUSBRequest*)CurrentQH->Request; + + // + // check if the request is complete + // + if (Request->IsRequestComplete() == FALSE) + { + // + // request is still in complete + // get new queue head + // + Status = Request->GetQueueHead(&NewQueueHead); + + // + // add to pending list + // + InsertTailList(&m_PendingRequestAsyncList, &NewQueueHead->LinkedQueueHeads); + } + + // + // put queue head into completed queue head list + // + InsertTailList(&m_CompletedRequestAsyncList, &CurrentQH->LinkedQueueHeads); + +} + +VOID +CUSBQueue::ProcessAsyncList( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + KIRQL OldLevel; + PLIST_ENTRY Entry; + PQUEUE_HEAD QueueHead; + IUSBRequest * Request; + BOOLEAN IsQueueHeadComplete; + + // + // lock completed async list + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // walk async list + // + Entry = AsyncListQueueHead->LinkedQueueHeads.Flink; + + while(Entry != &AsyncListQueueHead->LinkedQueueHeads) + { + // + // get queue head structure + // + QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // sanity check + // + PC_ASSERT(QueueHead->Request); + + // + // get IUSBRequest interface + // + Request = (IUSBRequest*)QueueHead->Request; + + + // + // move to next entry + // + Entry = Entry->Flink; + + // + // check if queue head is complete + // + IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead); + + DPRINT1("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); + + // + // check if queue head is complete + // + if (IsQueueHeadComplete) + { + // + // current queue head is complete + // + QueueHeadCompletion(QueueHead, Status); + + // + // ring door bell is going to be necessary + // + *ShouldRingDoorBell = TRUE; + } + } + + // + // release lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); +} + + +VOID +CUSBQueue::InterruptCallback( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + + DPRINT1("CUSBQueue::InterruptCallback\n"); + + // + // iterate asynchronous list + // + *ShouldRingDoorBell = FALSE; + ProcessAsyncList(Status, ShouldRingDoorBell); + + // + // TODO: implement periodic schedule processing + // +} + +VOID +CUSBQueue::QueueHeadCleanup( + PQUEUE_HEAD CurrentQH) +{ + IUSBRequest * Request; + BOOLEAN ShouldReleaseWhenDone; USBD_STATUS UrbStatus; - PQUEUE_HEAD NewQueueHead; - - // - // this function is called when a queue head has been completed + + // + // sanity checks // PC_ASSERT(CurrentQH->Token.Bits.Active == 0); - - // - // get contained usb request + PC_ASSERT(CurrentQH->Request); + + + // + // get request // Request = (IUSBRequest*)CurrentQH->Request; @@ -481,145 +626,7 @@ // // notify request that a queue head has been completed // - Request->CompletionCallback(Status, UrbStatus, CurrentQH); - - // - // now unlink the queue head - // FIXME: implement chained queue heads - // - UnlinkQueueHead(CurrentQH); - - // - // check if the request is complete - // - if (Request->IsRequestComplete() == FALSE) - { - // - // request is still in complete - // get new queue head - // - Status = Request->GetQueueHead(&NewQueueHead); - - // - // add to pending list - // - LinkQueueHead(AsyncListQueueHead, NewQueueHead); - } - else - { - // - // put queue head into completed queue head list - // - InsertTailList(&m_CompletedRequestAsyncList, &CurrentQH->LinkedQueueHeads); - } -} - -VOID -CUSBQueue::ProcessAsyncList( - IN NTSTATUS Status, - OUT PULONG ShouldRingDoorBell) -{ - KIRQL OldLevel; - PLIST_ENTRY Entry; - PQUEUE_HEAD QueueHead; - IUSBRequest * Request; - - // - // lock completed async list - // - KeAcquireSpinLock(&m_Lock, &OldLevel); - - // - // walk async list - // - Entry = AsyncListQueueHead->LinkedQueueHeads.Flink; - - while(Entry != &AsyncListQueueHead->LinkedQueueHeads) - { - // - // get queue head structure - // - QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); - - // - // sanity check - // - PC_ASSERT(QueueHead->Request); - - // - // get IUSBRequest interface - // - Request = (IUSBRequest*)QueueHead->Request; - - - // - // move to next entry - // - Entry = Entry->Flink; - - DPRINT1("Request %p QueueHead %p Complete %d\n", Request, QueueHead, Request->IsQueueHeadComplete(QueueHead)); - - // - // check if queue head is complete - // - if (Request->IsQueueHeadComplete(QueueHead)) - { - // - // current queue head is complete - // - QueueHeadCompletion(QueueHead, Status); - - // - // ring door bell is going to be necessary - // - *ShouldRingDoorBell = TRUE; - } - } - - // - // release lock - // - KeReleaseSpinLock(&m_Lock, OldLevel); - -} - - -VOID -CUSBQueue::InterruptCallback( - IN NTSTATUS Status, - OUT PULONG ShouldRingDoorBell) -{ - - DPRINT1("CUSBQueue::InterruptCallback\n"); - - // - // iterate asynchronous list - // - *ShouldRingDoorBell = FALSE; - ProcessAsyncList(Status, ShouldRingDoorBell); - - // - // TODO: implement periodic schedule processing - // -} - -VOID -CUSBQueue::QueueHeadCleanup( - PQUEUE_HEAD CurrentQH) -{ - IUSBRequest * Request; - BOOLEAN ShouldReleaseWhenDone; - - // - // sanity checks - // - PC_ASSERT(CurrentQH->Token.Bits.Active == 0); - PC_ASSERT(CurrentQH->Request); - - // - // get request - // - Request = (IUSBRequest*)CurrentQH->Request; + Request->CompletionCallback(STATUS_SUCCESS /*FIXME*/, UrbStatus, CurrentQH); // // let IUSBRequest free the queue head @@ -690,6 +697,27 @@ } // + // is there a pending async entry + // + if (!IsListEmpty(&m_PendingRequestAsyncList)) + { + // + // remove first entry + // + Entry = RemoveHeadList(&m_CompletedRequestAsyncList); + + // + // get queue head structure + // + CurrentQH = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // Add it to the pending list + // + LinkQueueHead(AsyncListQueueHead, CurrentQH); + } + + // // release lock // KeReleaseSpinLock(&m_Lock, OldLevel); 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] Sat Apr 30 17:44:43 2011 @@ -61,6 +61,7 @@ UCHAR GetDeviceAddress(); NTSTATUS BuildSetupPacket(); NTSTATUS BuildSetupPacketFromURB(); + ULONG InternalCalculateTransferLength(); // constructor / destructor CUSBRequest(IUnknown *OuterUnknown){} @@ -253,9 +254,14 @@ if (!Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL) { // + // sanity check + // + PC_ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer); + + // // Create one using TransferBuffer // - DPRINT1("Creating Mdl from Urb Buffer\n"); + DPRINT1("Creating Mdl from Urb Buffer %p Length %lu\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); m_TransferBufferMDL = IoAllocateMdl(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, FALSE, @@ -370,8 +376,15 @@ // Urb->UrbHeader.Length = 0; } - - DPRINT1("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x\n", this, m_Irp, NtStatusCode, UrbStatusCode); + else + { + // + // calculate transfer length + // + Urb->UrbBulkOrInterruptTransfer.TransferBufferLength = InternalCalculateTransferLength(); + } + + DPRINT1("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x Transferred Length %lu\n", this, m_Irp, NtStatusCode, UrbStatusCode, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); // // FIXME: check if the transfer was split @@ -525,9 +538,6 @@ ULONG CUSBRequest::InternalGetTransferType() { - PIO_STACK_LOCATION IoStack; - PURB Urb; - PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; ULONG TransferType; // @@ -535,38 +545,12 @@ // if (m_Irp) { - // - // get stack location - // - IoStack = IoGetCurrentIrpStackLocation(m_Irp); - - // - // get urb - // - Urb = (PURB)IoStack->Parameters.Others.Argument1; - - // - // check if there is a handle - // - if (Urb->UrbBulkOrInterruptTransfer.PipeHandle) - { - // - // cast to end point - // - EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; - - // - // end point is defined in the low byte of bmAttributes - // - TransferType = (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); - } - else - { - // - // no pipe handle, assume it is a control transfer - // - TransferType = USB_ENDPOINT_TYPE_CONTROL; - } + ASSERT(m_EndpointDescriptor); + + // + // end point is defined in the low byte of bmAttributes + // + TransferType = (m_EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); } else { @@ -585,30 +569,13 @@ UCHAR CUSBRequest::InternalGetPidDirection() { - PIO_STACK_LOCATION IoStack; - PURB Urb; - PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; - ASSERT(m_Irp); - // - // get stack location - // - IoStack = IoGetCurrentIrpStackLocation(m_Irp); - - // - // get urb - // - Urb = (PURB)IoStack->Parameters.Others.Argument1; - - // - // cast to end point - // - EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; + ASSERT(m_EndpointDescriptor); // // end point is defined in the low byte of bEndpointAddress // - return (EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; + return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; } //---------------------------------------------------------------------------------------- @@ -816,16 +783,19 @@ // // get virtual base of mdl // - Base = MmGetMdlVirtualAddress(m_TransferBufferMDL); + Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); BytesAvailable = m_TransferBufferLength; PC_ASSERT(m_EndpointDescriptor); + PC_ASSERT(Base); + DPRINT1("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); DPRINT1("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); - DPRINT1("Request %p Base Address %p TransferBytesLength %lu\n", this, Base, BytesAvailable); + DPRINT1("Request %p Base Address %p TransferBytesLength %lu MDL %p\n", this, Base, BytesAvailable, m_TransferBufferMDL); DPRINT1("InternalGetPidDirection() %d EndPointAddress %x\n", InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F); + DPRINT1("Irp %p QueueHead %p\n", m_Irp, QueueHead); //PC_ASSERT(InternalGetPidDirection() == USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); @@ -881,7 +851,7 @@ // // check if request fills another page // - if (PageOffset + BytesAvailable >= PAGE_SIZE) + if (PageOffset + BytesAvailable > PAGE_SIZE) { // // move to next page @@ -977,6 +947,11 @@ } // + // store transfer bytes of descriptor + // + m_TransferDescriptors[Index]->TotalBytesToTransfer = m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; + + // // Go ahead and link descriptors // if (Index > 0) @@ -1579,6 +1554,36 @@ *OutMDL = m_TransferBufferMDL; *TransferLength = m_TransferBufferLength; } +//----------------------------------------------------------------------------------------- +ULONG +CUSBRequest::InternalCalculateTransferLength() +{ + if (!m_Irp) + { + // + // FIXME: get length for control request + // + return m_TransferBufferLength; + } + + // + // sanity check + // + ASSERT(m_EndpointDescriptor); + + if (USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)) + { + // + // bulk in request + // + return m_TransferDescriptors[0]->TotalBytesToTransfer - m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer; + } + + // + // bulk out transfer + // + return m_TransferBufferLength; +} //----------------------------------------------------------------------------------------- NTSTATUS

1 0

[ilardig] 51505: [SUBST] Italian update by Paolo Devoti. See issue #6178 for more details.
by ilardig＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: ilardig Date: Sat Apr 30 15:55:13 2011 New Revision: 51505 URL: http://svn.reactos.org/svn/reactos?rev=51505&view=rev Log: [SUBST] Italian update by Paolo Devoti. See issue #6178 for more details. Modified: trunk/reactos/base/system/subst/lang/it-IT.rc Modified: trunk/reactos/base/system/subst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/it-… ============================================================================== --- trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] Sat Apr 30 15:55:13 2011 @@ -3,9 +3,9 @@ STRINGTABLE BEGIN - IDS_INCORRECT_PARAMETER_COUNT "Numero di parametri invalido - %s\n" - IDS_INVALID_PARAMETER "Incorrect number of parameters - %s\n" - IDS_INVALID_PARAMETER2 "Parametro invalido - %s\n" + IDS_INCORRECT_PARAMETER_COUNT "Numero di parametri errato - %s\n" + IDS_INVALID_PARAMETER "Numero di parametri errato - %s\n" + IDS_INVALID_PARAMETER2 "Parametro errato - %s\n" IDS_DRIVE_ALREAD_SUBSTED "Unità già sostituita\n" IDS_FAILED_WITH_ERROCODE "Interruzione con codice di errore 0x%x: %s\n" IDS_USAGE "Associa un percorso ad una lettera di unità.\n\nSUBST [unità1: [unità2:]percorso]\nSUBST unità1: /D\n\n unità1: \

1 0

[akhaldi] 51504: [CRT/MINGW-W64] * Reorganize dll entry and C runtime initialization. By Kai Tietz.
by akhaldi＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: akhaldi Date: Sat Apr 30 14:26:21 2011 New Revision: 51504 URL: http://svn.reactos.org/svn/reactos?rev=51504&view=rev Log: [CRT/MINGW-W64] * Reorganize dll entry and C runtime initialization. By Kai Tietz. Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtdll.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] Sat Apr 30 14:26:21 2011 @@ -180,33 +180,33 @@ goto i__leave; } _pei386_runtime_relocator (); - if (retcode && dwReason == DLL_PROCESS_ATTACH) + if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) + { + retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved); + if (!retcode) + goto i__leave; + retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); + if (! retcode) + { + if (dwReason == DLL_PROCESS_ATTACH) + _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + goto i__leave; + } + } + if (dwReason == DLL_PROCESS_ATTACH) __main (); - if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) + retcode = DllMain(hDllHandle,dwReason,lpreserved); + if (dwReason == DLL_PROCESS_ATTACH && ! retcode) + { + DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + } + if (dwReason == DLL_PROCESS_DETACH || dwReason == DLL_THREAD_DETACH) { retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); - if (retcode) - retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved); - if (! retcode) - goto i__leave; - } - retcode = DllMain(hDllHandle,dwReason,lpreserved); - if ((dwReason == DLL_PROCESS_ATTACH) && ! retcode) - { - DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); - _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); - DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); - } - if (dwReason == DLL_PROCESS_DETACH || dwReason == DLL_THREAD_DETACH) - { if (_CRT_INIT (hDllHandle, dwReason, lpreserved) == FALSE) - { - retcode = FALSE; - } - if (retcode) - { - retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); - } + retcode = FALSE; } i__leave: __native_dllmain_reason = UINT_MAX;

1 0

[mkupfer] 51503: Add Python 3
by mkupfer＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: mkupfer Date: Sat Apr 30 11:56:02 2011 New Revision: 51503 URL: http://svn.reactos.org/svn/reactos?rev=51503&view=rev Log: Add Python 3 Added: trunk/reactos/base/applications/rapps/rapps/python3.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/python.txt Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Sat Apr 30 11:56:02 2011 @@ -1,7 +1,7 @@ ï»¿; UTF-8 [Section] -Name = Python +Name = Python 2 Version = 2.7.1 Licence = GPL/LGPL Description = A remarkably powerful dynamic programming language. Added: trunk/reactos/base/applications/rapps/rapps/python3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python3.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/python3.txt [iso-8859-1] Sat Apr 30 11:56:02 2011 @@ -1,0 +1,27 @@ +ï»¿; UTF-8 + +[Section] +Name = Python 3 +Version = 3.2 +Licence = GPL/LGPL +Description = A remarkably powerful dynamic programming language. +Size = 17.2MB +Category = 7 +URLSite = http://www.python.org/ +URLDownload = http://www.python.org/ftp/python/3.2/python-3.2.msi +CDPath = none + +[Section.0407] +Description = Eine sehr mÃ¤chtige, dynamische Programmiersprache. + +[Section.040a] +Description = Un lenguaje de programaciÃ³n dinÃ¡mico sumamente potente. + +[Section.040c] +Description = Un langage de programmation dynamique remarquablement puissant. + +[Section.0415] +Description = PotÄÅ¼y i dynamiczny jÄzyk programowania. + +[Section.0422] +Description = ÐÑÐ¶Ðµ Ð¿Ð¾ÑÑÐ¶Ð½Ð° Ð´Ð¸Ð½Ð°Ð¼ÑÑÐ½Ð° Ð¼Ð¾Ð²Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ÑÐ²Ð°Ð½Ð½Ñ. Propchange: trunk/reactos/base/applications/rapps/rapps/python3.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 51502: [CMAKE] * configure.cmd: formatting.
by akhaldi＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: akhaldi Date: Sat Apr 30 11:34:02 2011 New Revision: 51502 URL: http://svn.reactos.org/svn/reactos?rev=51502&view=rev Log: [CMAKE] * configure.cmd: formatting. Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Sat Apr 30 11:34:02 2011 @@ -28,7 +28,7 @@ cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. - exit /b + exit /b ) echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% if not "%1" == "VSSolution" ( @@ -57,7 +57,7 @@ :: Create directories :createdirs -set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% +set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% if "%REACTOS_SOURCE_DIR%" == "%CD%\" ( echo Creating directories in %REACTOS_OUTPUT_PATH%

1 0

[janderwald] 51501: [USBEHCI_NEW] - Port URB_FUNCTION_CLASS_INTERFACE from mjmartin usbehci driver - Fix typo in interface declaration - Disable assert for now - Return irp status pending when irp ...
by janderwald＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: janderwald Date: Sat Apr 30 08:04:35 2011 New Revision: 51501 URL: http://svn.reactos.org/svn/reactos?rev=51501&view=rev Log: [USBEHCI_NEW] - Port URB_FUNCTION_CLASS_INTERFACE from mjmartin usbehci driver - Fix typo in interface declaration - Disable assert for now - Return irp status pending when irp is added to the queue - Fix bug in InternalGetPidDirection - More work on the bulk transfers, not yet working 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/memory_manager.cpp 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] Sat Apr 30 08:04:35 2011 @@ -65,6 +65,7 @@ NTSTATUS HandleSelectConfiguration(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleSelectInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClassInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); friend VOID StatusChangeEndpointCallBack(PVOID Context); @@ -1355,6 +1356,70 @@ DPRINT1("CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", Urb->UrbControlDescriptorRequest.DescriptorType); break; } + + // + // done + // + return Status; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleClassInterface( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + + // + // sanity check + // + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + + // + // check if this is a valid usb device handle + // + PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); + DPRINT1("TransferBufferLength %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); + DPRINT1("TransferBuffer %x\n", Urb->UrbControlVendorClassRequest.TransferBuffer); + DPRINT1("TransferBufferMDL %x\n", Urb->UrbControlVendorClassRequest.TransferBufferMDL); + DPRINT1("RequestTypeReservedBits %x\n", Urb->UrbControlVendorClassRequest.RequestTypeReservedBits); + DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request); + DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); + DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0xa1; //FIXME: Const. + CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlVendorClassRequest.TransferBufferLength, Urb->UrbControlVendorClassRequest.TransferBuffer); + + // + // assert on failure + // + PC_ASSERT(NT_SUCCESS(Status)); + // // done @@ -1419,6 +1484,9 @@ case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: Status = HandleBulkOrInterruptTransfer(Irp, Urb); break; + case URB_FUNCTION_CLASS_INTERFACE: + Status = HandleClassInterface(Irp, Urb); + break; default: DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); break; 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] Sat Apr 30 08:04:35 2011 @@ -785,7 +785,7 @@ // // Description: submits an irp containing an urb - virtual NTSTATUS SubmitIrp(PIRP Urb) = 0; + virtual NTSTATUS SubmitIrp(PIRP Irp) = 0; //----------------------------------------------------------------------------------------- // Modified: branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] Sat Apr 30 08:04:35 2011 @@ -136,7 +136,7 @@ // sanity checks // ASSERT(Size < PAGE_SIZE); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + //ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); // // align request 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] Sat Apr 30 08:04:35 2011 @@ -484,6 +484,11 @@ Status = Request->InitializeWithIrp(m_DmaManager, Irp); // + // mark irp as pending + // + IoMarkIrpPending(Irp); + + // // now add the request // Status = m_Queue->AddUSBRequest(Request); @@ -500,7 +505,7 @@ // // done // - return Status; + return STATUS_PENDING; } //---------------------------------------------------------------------------------------- @@ -1199,6 +1204,16 @@ // // copy pipe handle // + DPRINT1("PipeIndex %lu\n", PipeIndex); + DPRINT1("EndpointAddress %x\n", InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + DPRINT1("Interval %d\n", InterfaceInfo->Pipes[PipeIndex].Interval); + DPRINT1("MaximumPacketSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize); + DPRINT1("MaximumTransferSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize); + DPRINT1("PipeFlags %d\n", InterfaceInfo->Pipes[PipeIndex].PipeFlags); + DPRINT1("PipeType %dd\n", InterfaceInfo->Pipes[PipeIndex].PipeType); + DPRINT1("UsbEndPoint %x\n", Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress); + PC_ASSERT(Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress == InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + InterfaceInfo->Pipes[PipeIndex].PipeHandle = &Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor; if (Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes & (USB_ENDPOINT_TYPE_ISOCHRONOUS | USB_ENDPOINT_TYPE_INTERRUPT)) 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] Sat Apr 30 08:04:35 2011 @@ -371,6 +371,8 @@ Urb->UrbHeader.Length = 0; } + DPRINT1("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x\n", this, m_Irp, NtStatusCode, UrbStatusCode); + // // FIXME: check if the transfer was split // if yes dont complete irp yet @@ -604,9 +606,9 @@ EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; // - // end point is defined in the low byte of bmAttributes - // - return (EndpointDescriptor->bmAttributes & USB_ENDPOINT_DIRECTION_MASK); + // end point is defined in the low byte of bEndpointAddress + // + return (EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; } //---------------------------------------------------------------------------------------- @@ -779,8 +781,11 @@ PQUEUE_HEAD * OutHead) { NTSTATUS Status; - ULONG NumTransferDescriptors, TransferBufferRounded, NumPages, Index, FailIndex; PQUEUE_HEAD QueueHead; + ULONG TransferDescriptorCount, Index; + ULONG BytesAvailable, BufferIndex; + PVOID Base; + ULONG PageOffset; // // Allocate the queue head @@ -801,38 +806,33 @@ PC_ASSERT(QueueHead); // - // Determine number of transfer descriptors needed. Max size is 3 * 5 Pages - // FIXME: Do we need anything bigger? - // - TransferBufferRounded = ROUND_TO_PAGES(m_TransferBufferLength); - NumPages = Index = 0; - NumTransferDescriptors = 1; - while (TransferBufferRounded > 0) - { - TransferBufferRounded -= PAGE_SIZE; - NumPages++; - Index++; - if (Index == 5) - { - NumTransferDescriptors++; - Index = 0; - } - } - - DPRINT1("Need TransferDescriptors %x, Pages %x\n", NumTransferDescriptors, NumPages); - DPRINT1("This is the end of the line!!!!!!!!\n"); - return STATUS_NOT_IMPLEMENTED; - //FIXME: Below needs work. - - // - // FIXME: Handle transfers greater than 5 * PAGE_SIZE * 3 - // - if (NumTransferDescriptors > 3) NumTransferDescriptors = 3; + // FIXME: support more than one descriptor + // + PC_ASSERT(m_TransferBufferLength < PAGE_SIZE * 5); + PC_ASSERT(m_TransferBufferLength); + + TransferDescriptorCount = 1; + + // + // get virtual base of mdl + // + Base = MmGetMdlVirtualAddress(m_TransferBufferMDL); + BytesAvailable = m_TransferBufferLength; + + PC_ASSERT(m_EndpointDescriptor); + + DPRINT1("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); + DPRINT1("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); + + DPRINT1("Request %p Base Address %p TransferBytesLength %lu\n", this, Base, BytesAvailable); + DPRINT1("InternalGetPidDirection() %d EndPointAddress %x\n", InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F); + + //PC_ASSERT(InternalGetPidDirection() == USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); // // Allocated transfer descriptors // - for (Index = 0; Index < NumTransferDescriptors; Index++) + for (Index = 0; Index < TransferDescriptorCount; Index++) { Status = CreateDescriptor(&m_TransferDescriptors[Index]); if (!NT_SUCCESS(Status)) @@ -850,10 +850,130 @@ // Free Descriptors // FIXME: Implement FreeDescriptors // - //for (FailIndex = 0; FailIndex < Index; FailIndex++) - //FreeDescriptor(m_TransferDescriptors[FailIndex]); - return Status; + } + + // + // sanity check + // + PC_ASSERT(BytesAvailable); + + // + // now setup transfer buffers + // + for(BufferIndex = 0; BufferIndex < 5; BufferIndex++) + { + // + // setup buffer + // + if (BufferIndex == 0) + { + // + // use physical address + // + m_TransferDescriptors[Index]->BufferPointer[0] = MmGetPhysicalAddress(Base).LowPart; + + // + // get offset within page + // + PageOffset = BYTE_OFFSET(m_TransferDescriptors[Index]->BufferPointer[0]); + + // + // check if request fills another page + // + if (PageOffset + BytesAvailable >= PAGE_SIZE) + { + // + // move to next page + // + Base = (PVOID)ROUND_TO_PAGES(Base); + + // + // increment transfer bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = PAGE_SIZE - PageOffset; + + // + // decrement available byte count + // + BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; + + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + } + else + { + // + // request ends on the first buffer page + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = BytesAvailable; + BytesAvailable = 0; + + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + break; + } + } + else + { + // + // the following pages always start on byte zero of each page + // + PC_ASSERT(((ULONG_PTR)Base & (PAGE_SIZE-1)) == 0); + + if (BytesAvailable >= PAGE_SIZE) + { + // + // store address + // + m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; + + // + // move to next page + // + Base = (PVOID)((ULONG_PTR)Base + PAGE_SIZE); + + // + // increment transfer descriptor bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += PAGE_SIZE; + + // + // decrement available byte count + // + BytesAvailable -= PAGE_SIZE; + + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + } + else + { + PC_ASSERT(BytesAvailable); + + // + // store address + // + m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; + + // + // increment transfer descriptor bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += BytesAvailable; + + // + // decrement available byte count + // + BytesAvailable -= BytesAvailable; + + // + // done + // + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + + break; + } + } } // @@ -863,8 +983,26 @@ { m_TransferDescriptors[Index - 1]->NextPointer = m_TransferDescriptors[Index]->PhysicalAddr; } - - } + + // + // setup direction + // + m_TransferDescriptors[Index]->Token.Bits.PIDCode = InternalGetPidDirection(); + + // + // FIXME: performance penality? + // + m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; + + // + // FIXME need dead queue transfer descriptor? + // + } + + // + // all bytes should have been consumed + // + PC_ASSERT(BytesAvailable == 0); // // Initialize the QueueHead @@ -881,19 +1019,20 @@ } QueueHead->Token.Bits.DataToggle = TRUE; - - // - // Setup descriptors - // - m_TransferDescriptors[0]->Token.Bits.PIDCode = InternalGetPidDirection(); - //m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer = ??? - //m_TransferDescriptors[0]->Token.Bits.DataToggle = FALSE; - - m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; - - ASSERT(m_TransferBufferMDL); - - + + // + // link descriptor with queue head + // + QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; + + // + // store result + // + *OutHead = QueueHead; + + // + // done + // return STATUS_SUCCESS; } @@ -1351,6 +1490,7 @@ // // release transfer descriptors // + DPRINT1("m_TransferDescriptor[0] Length %lu\n", m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer); m_DmaManager->Release(m_TransferDescriptors[0], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); m_TransferDescriptors[0] = 0; }

1 0

[ilardig] 51500: [NOTEPAD] Revert 51497, this is really a hack, sorry.
by ilardig＠svn.reactos.org 30 Apr '11

30 Apr '11

Author: ilardig Date: Sat Apr 30 00:49:10 2011 New Revision: 51500 URL: http://svn.reactos.org/svn/reactos?rev=51500&view=rev Log: [NOTEPAD] Revert 51497, this is really a hack, sorry. Modified: trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Sat Apr 30 00:49:10 2011 @@ -182,6 +182,7 @@ SaveDword(hKey, _T("lfCharSet"), Globals.lfFont.lfCharSet); SaveDword(hKey, _T("lfClipPrecision"), Globals.lfFont.lfClipPrecision); SaveDword(hKey, _T("lfEscapement"), Globals.lfFont.lfEscapement); + SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); SaveDword(hKey, _T("lfItalic"), Globals.lfFont.lfItalic); SaveDword(hKey, _T("lfOrientation"), Globals.lfFont.lfOrientation); SaveDword(hKey, _T("lfOutPrecision"), Globals.lfFont.lfOutPrecision); @@ -189,27 +190,14 @@ SaveDword(hKey, _T("lfQuality"), Globals.lfFont.lfQuality); SaveDword(hKey, _T("lfStrikeOut"), Globals.lfFont.lfStrikeOut); SaveDword(hKey, _T("lfUnderline"), Globals.lfFont.lfUnderline); + SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); + SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); SaveDword(hKey, _T("fWrap"), Globals.bWrapLongLines ? 1 : 0); SaveDword(hKey, _T("fStatusBar"), Globals.bShowStatusBar ? 1 : 0); SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left); SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top); SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left); SaveDword(hKey, _T("iWindowPosDY"), Globals.main_rect.bottom - Globals.main_rect.top); - - if (*Globals.lfFont.lfFaceName == '\0') - { - static const TCHAR default_font[] = _T("Tahoma"); - _tcscpy(Globals.lfFont.lfFaceName, default_font); - Globals.lfFont.lfHeight = 100; - Globals.lfFont.lfWeight = 400; - SaveDword(hKey, _T("iPointSize"), Globals.lfFont.lfHeight); - } - else - { - SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); - } - SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); - SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); RegCloseKey(hKey); }

1 0

[gadamopoulos] 51499: [explorer] - Return 1 when explorer terminates. This value lets winlogon know that explorer terminated without errors and it doesn't need to restart
by gadamopoulos＠svn.reactos.org 29 Apr '11

29 Apr '11

Author: gadamopoulos Date: Fri Apr 29 21:59:48 2011 New Revision: 51499 URL: http://svn.reactos.org/svn/reactos?rev=51499&view=rev Log: [explorer] - Return 1 when explorer terminates. This value lets winlogon know that explorer terminated without errors and it doesn't need to restart Modified: trunk/reactos/base/shell/explorer/explorer.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Fri Apr 29 21:59:48 2011 @@ -968,7 +968,9 @@ } #endif - return Window::MessageLoop(); + Window::MessageLoop(); + + return 1; }

1 0

[gadamopoulos] 51498: [taskmgr] - When terminating an application use 1 as exit code. This is used by Task Manager in windows. It also prevents explorer from restarting in windows - Disable redrawi...
by gadamopoulos＠svn.reactos.org 29 Apr '11

29 Apr '11

Author: gadamopoulos Date: Fri Apr 29 21:49:37 2011 New Revision: 51498 URL: http://svn.reactos.org/svn/reactos?rev=51498&view=rev Log: [taskmgr] - When terminating an application use 1 as exit code. This is used by Task Manager in windows. It also prevents explorer from restarting in windows - Disable redrawing the list of processes while the list is updated. Fixes flicker in windows Modified: trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] Fri Apr 29 21:49:37 2011 @@ -50,7 +50,7 @@ return; } - if (!TerminateProcess(hProcess, 0)) + if (!TerminateProcess(hProcess, 1)) { GetLastErrorText(strErrorText, 260); LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Fri Apr 29 21:49:37 2011 @@ -435,6 +435,8 @@ LV_ITEM item; LPPROCESS_PAGE_LIST_ITEM pData; + SendMessage(hProcessPageListCtrl, WM_SETREDRAW, FALSE, 0); + /* Remove old processes */ for (i = 0; i < ListView_GetItemCount(hProcessPageListCtrl); i++) { @@ -464,6 +466,8 @@ { (void)ListView_SortItems(hProcessPageListCtrl, ProcessPageCompareFunc, NULL); } + + SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0); } BOOL ProcessRunning(ULONG ProcessId)

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