[USBEHCI]
authorJohannes Anderwald <johannes.anderwald@reactos.org>
Mon, 23 Jan 2012 16:17:21 +0000 (16:17 +0000)
committerJohannes Anderwald <johannes.anderwald@reactos.org>
Mon, 23 Jan 2012 16:17:21 +0000 (16:17 +0000)
- Remove traces

svn path=/branches/usb-bringup-trunk/; revision=55117

drivers/usb/usbehci_new/hardware.cpp
drivers/usb/usbehci_new/hub_controller.cpp
drivers/usb/usbehci_new/memory_manager.cpp
drivers/usb/usbehci_new/usb_device.cpp
drivers/usb/usbehci_new/usb_queue.cpp

index 10a599c..82974f7 100644 (file)
@@ -934,9 +934,7 @@ CUSBHardwareDevice::AcquireDeviceLock(void)
     //
     // acquire lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(&m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // return old irql
@@ -949,7 +947,6 @@ VOID
 CUSBHardwareDevice::ReleaseDeviceLock(
     KIRQL OldLevel)
 {
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(&m_Lock, OldLevel);
 }
 
index 1876624..e6fd53f 100644 (file)
@@ -1861,9 +1861,7 @@ CHubController::AcquireDeviceAddress()
     //
     // acquire device lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(&m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // find address
@@ -1885,7 +1883,6 @@ CHubController::AcquireDeviceAddress()
     //
     // release spin lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(&m_Lock, OldLevel);
 
     //
@@ -1903,9 +1900,7 @@ CHubController::ReleaseDeviceAddress(
     //
     // acquire device lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(&m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // sanity check
@@ -1925,7 +1920,6 @@ CHubController::ReleaseDeviceAddress(
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(&m_Lock, OldLevel);
 }
 //-----------------------------------------------------------------------------------------
@@ -1941,9 +1935,7 @@ CHubController::RemoveUsbDevice(
     //
     // acquire lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(&m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // point to first entry
@@ -1991,7 +1983,6 @@ CHubController::RemoveUsbDevice(
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(&m_Lock, OldLevel);
 
     //
@@ -2011,9 +2002,7 @@ CHubController::ValidateUsbDevice(PUSBDEVICE UsbDevice)
     //
     // acquire lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(&m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // point to first entry
@@ -2051,7 +2040,6 @@ CHubController::ValidateUsbDevice(PUSBDEVICE UsbDevice)
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(&m_Lock, OldLevel);
 
     //
@@ -2089,9 +2077,7 @@ CHubController::AddUsbDevice(
     //
     // acquire lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(&m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // insert entry
@@ -2101,7 +2087,6 @@ CHubController::AddUsbDevice(
     //
     // release spin lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(&m_Lock, OldLevel);
 
     //
@@ -2121,9 +2106,7 @@ CHubController::SetNotification(
     //
     // 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 @@ CHubController::SetNotification(
     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);
 }
 
 //=================================================================================================
index bc1651e..1cfed3e 100644 (file)
@@ -157,9 +157,7 @@ CDMAMemoryManager::Allocate(
     //
     // acquire lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // helper variable
@@ -237,7 +235,6 @@ CDMAMemoryManager::Allocate(
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(m_Lock, OldLevel);
 
     //
@@ -307,9 +304,7 @@ CDMAMemoryManager::Release(
     //
     // acquire lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // release buffer
@@ -319,7 +314,6 @@ CDMAMemoryManager::Release(
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(m_Lock, OldLevel);
 
     //
index d9a950c..7ef98b8 100644 (file)
@@ -519,9 +519,7 @@ CUSBDevice::SubmitIrp(
     //
     // acquire device lock
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(&m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // commit urb
@@ -531,7 +529,6 @@ CUSBDevice::SubmitIrp(
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(&m_Lock, OldLevel);
 
     return Status;
index 830ef29..447f1dc 100644 (file)
@@ -33,7 +33,7 @@ public:
         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 @@ CUSBQueue::AddUSBRequest(
         //
         // 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 @@ CUSBQueue::QueueHeadCompletion(
     PQUEUE_HEAD CurrentQH,
     NTSTATUS Status)
 {
+    KIRQL OldLevel;
+
     //
     // now unlink the queue head
     // FIXME: implement chained queue heads
@@ -610,9 +608,7 @@ CUSBQueue::ProcessAsyncList(
     //
     // lock completed async list
     //
-    DPRINT(__FUNCTION__ " acquire\n");
     KeAcquireSpinLock(m_Lock, &OldLevel);
-    DPRINT(__FUNCTION__ " acquired\n");
 
     //
     // walk async list 
@@ -668,7 +664,6 @@ CUSBQueue::ProcessAsyncList(
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(m_Lock, OldLevel);
 }
 
@@ -772,9 +767,7 @@ CUSBQueue::QueueHeadCleanup(
             //
             // first acquire request lock
             //
-            DPRINT(__FUNCTION__ " acquire\n");
             KeAcquireSpinLock(m_Lock, &OldLevel);
-            DPRINT(__FUNCTION__ " acquired\n");
 
             //
             // add to pending list
@@ -784,7 +777,6 @@ CUSBQueue::QueueHeadCleanup(
             //
             // release queue head
             //
-            DPRINT(__FUNCTION__ "release\n");
             KeReleaseSpinLock(m_Lock, OldLevel);
 
             //
@@ -854,9 +846,7 @@ CUSBQueue::CompleteAsyncRequests()
     //
     // 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 @@ CUSBQueue::CompleteAsyncRequests()
         //
         // release lock
         //
-        DPRINT(__FUNCTION__ "release\n");
         KeReleaseSpinLock(m_Lock, OldLevel);
 
         //
@@ -894,10 +883,7 @@ CUSBQueue::CompleteAsyncRequests()
         //
         // first acquire request lock
         //
-        DPRINT(__FUNCTION__ " acquire\n");
         KeAcquireSpinLock(m_Lock, &OldLevel);
-        DPRINT(__FUNCTION__ " acquired\n");
-
     }
 
     //
@@ -924,7 +910,6 @@ CUSBQueue::CompleteAsyncRequests()
     //
     // release lock
     //
-    DPRINT(__FUNCTION__ "release\n");
     KeReleaseSpinLock(m_Lock, OldLevel);
 }