Author: janderwald Date: Mon Jan 23 16:17:21 2012 New Revision: 55117
URL: http://svn.reactos.org/svn/reactos?rev=55117&view=rev Log: [USBEHCI] - Remove traces
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us... ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -934,9 +934,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // return old irql @@ -949,7 +947,6 @@ CUSBHardwareDevice::ReleaseDeviceLock( KIRQL OldLevel) { - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); }
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us... ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -1861,9 +1861,7 @@ // // acquire device lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // find address @@ -1885,7 +1883,6 @@ // // release spin lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel);
// @@ -1903,9 +1900,7 @@ // // acquire device lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // sanity check @@ -1925,7 +1920,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); } //----------------------------------------------------------------------------------------- @@ -1941,9 +1935,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // point to first entry @@ -1991,7 +1983,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel);
// @@ -2011,9 +2002,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // point to first entry @@ -2051,7 +2040,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel);
// @@ -2089,9 +2077,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // insert entry @@ -2101,7 +2087,6 @@ // // release spin lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel);
// @@ -2121,9 +2106,7 @@ // // acquire hub controller lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // now set the callback routine and context of the hub @@ -2131,11 +2114,10 @@ m_HubCallbackContext = CallbackContext; m_HubCallbackRoutine = CallbackRoutine;
- // - // release hub controller lock - // - DPRINT(__FUNCTION__ "release\n"); - KeReleaseSpinLock(&m_Lock, OldLevel); + // + // release hub controller lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); }
//=================================================================================================
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us... ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -157,9 +157,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // helper variable @@ -237,7 +235,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel);
// @@ -307,9 +304,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // release buffer @@ -319,7 +314,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel);
//
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us... ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -519,9 +519,7 @@ // // acquire device lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // commit urb @@ -531,7 +529,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel);
return Status;
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us... ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -33,7 +33,7 @@ return m_Ref; }
- virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN PDMAMEMORYMANAGER MemManager, IN PKSPIN_LOCK Lock); + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN PDMAMEMORYMANAGER MemManager, IN OPTIONAL PKSPIN_LOCK Lock); virtual ULONG GetPendingRequestCount(); virtual NTSTATUS AddUSBRequest(PURB Urb); virtual NTSTATUS AddUSBRequest(IUSBRequest * Request); @@ -355,12 +355,8 @@ // // Add it to the pending list // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); - LinkQueueHead(AsyncListQueueHead, QueueHead); - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); }
@@ -579,6 +575,8 @@ PQUEUE_HEAD CurrentQH, NTSTATUS Status) { + KIRQL OldLevel; + // // now unlink the queue head // FIXME: implement chained queue heads @@ -610,9 +608,7 @@ // // lock completed async list // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // walk async list @@ -668,7 +664,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); }
@@ -772,9 +767,7 @@ // // first acquire request lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // add to pending list @@ -784,7 +777,6 @@ // // release queue head // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel);
// @@ -854,9 +846,7 @@ // // first acquire request lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n");
// // the list should not be empty @@ -883,7 +873,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel);
// @@ -894,10 +883,7 @@ // // first acquire request lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); - }
// @@ -924,7 +910,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); }
-
janderwald＠svn.reactos.org