Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBEHCI]

Browse source 
- Fix a type-limits warning
- Remove unnecessary casts and asserts
- Use NULL for pointer comparison
- Fix IN vs OUT annotation

svn path=/trunk/; revision=63687
This commit is contained in:
Thomas Faber 2014-07-05 16:32:43 +00:00
parent a2e82498a2
commit 9dc1dcc32b
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/usb/usbehci/interfaces.h
View file

@ -23,7 +23,7 @@
IN struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE; \
\
STDMETHOD_(VOID, GetCommandRegister)( THIS_ \
IN struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE;
OUT struct _EHCI_USBCMD_CONTENT *UsbCmd) PURE;
#define IMP_IUSBEHCIHARDWARE \
STDMETHODIMP_(VOID) SetAsyncListRegister( \
@ -39,7 +39,7 @@
STDMETHODIMP_(VOID) SetCommandRegister( \
IN struct _EHCI_USBCMD_CONTENT *UsbCmd); \
STDMETHODIMP_(VOID) GetCommandRegister( \
IN struct _EHCI_USBCMD_CONTENT *UsbCmd);
OUT struct _EHCI_USBCMD_CONTENT *UsbCmd);
DECLARE_INTERFACE_(IEHCIHardwareDevice, IUSBHardwareDevice)
{

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

@ -376,6 +376,7 @@ CUSBQueue::GetIntervalIndex(
{
UCHAR IntervalIndex;
ASSERT(Interval != 0);
if (Interval == 1)
IntervalIndex = 1;
else if (Interval == 2)
@ -392,11 +393,10 @@ CUSBQueue::GetIntervalIndex(
IntervalIndex = 7;
else if (Interval <= 128)
IntervalIndex = 8;
else if (Interval <= 256)
IntervalIndex = 9;
else
IntervalIndex = 10;
IntervalIndex = 9;
ASSERT(IntervalIndex < EHCI_INTERRUPT_ENTRIES_COUNT);
return IntervalIndex;
}
@ -746,8 +746,7 @@ CUSBQueue::ProcessPeriodicSchedule(
//
// get queue head structure
//
QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads);
ASSERT(QueueHead);
QueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads);
//
// sanity check
@ -822,8 +821,7 @@ CUSBQueue::ProcessAsyncList(
//
// get queue head structure
//
QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads);
ASSERT(QueueHead);
QueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads);
//
// sanity check

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

@ -894,7 +894,7 @@ CUSBRequest::BuildControlTransferQueueHead(
//
QueueHead->EndPointCharacteristics.DeviceAddress = GetDeviceAddress();
ASSERT(m_EndpointDescriptor == FALSE);
ASSERT(m_EndpointDescriptor == NULL);
//
// init setup descriptor