Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-08 02:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USBEHCI]

Browse source 
- Remove traces

svn path=/branches/usb-bringup-trunk/; revision=55117
This commit is contained in:
Johannes Anderwald 2012-01-23 16:17:21 +00:00
parent 2e9bda4f63
commit 88a17911fa
5 changed files with 7 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/usb/usbehci_new/hardware.cpp
View 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);
}

18
drivers/usb/usbehci_new/hub_controller.cpp
View 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
@ -2134,7 +2117,6 @@ CHubController::SetNotification(
//
// release hub controller lock
//
DPRINT(__FUNCTION__ "release\n");
KeReleaseSpinLock(&m_Lock, OldLevel);
}

6
drivers/usb/usbehci_new/memory_manager.cpp
View 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);
//

3
drivers/usb/usbehci_new/usb_device.cpp
View 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;

21
drivers/usb/usbehci_new/usb_queue.cpp
View 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);
}