i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More style fixes to ehci.

Browse Source
This commit is contained in:
Adrien Destugues
2014-08-07 13:51:36 +02:00
parent 267d1d780c
commit 848bfaa602
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/ehci.cpp
+8 -8
View File
@@ -700,7 +700,7 @@ EHCI::SubmitTransfer(Transfer *transfer)
return fRootHub->ProcessTransfer(this, transfer); return fRootHub->ProcessTransfer(this, transfer);
Pipe *pipe = transfer->TransferPipe(); Pipe *pipe = transfer->TransferPipe();
if (pipe->Type() & USB_OBJECT_ISO_PIPE) if ((pipe->Type() & USB_OBJECT_ISO_PIPE) != 0)
return SubmitIsochronous(transfer); return SubmitIsochronous(transfer);
ehci_qh *queueHead = CreateQueueHead(); ehci_qh *queueHead = CreateQueueHead();
@@ -718,7 +718,7 @@ EHCI::SubmitTransfer(Transfer *transfer)
bool directionIn; bool directionIn;
ehci_qtd *dataDescriptor; ehci_qtd *dataDescriptor;
if (pipe->Type() & USB_OBJECT_CONTROL_PIPE) { if ((pipe->Type() & USB_OBJECT_CONTROL_PIPE) != 0) {
result = FillQueueWithRequest(transfer, queueHead, &dataDescriptor, result = FillQueueWithRequest(transfer, queueHead, &dataDescriptor,
&directionIn); &directionIn);
} else { } else {
@@ -745,7 +745,7 @@ EHCI::SubmitTransfer(Transfer *transfer)
print_queue(queueHead); print_queue(queueHead);
#endif #endif
if (pipe->Type() & USB_OBJECT_INTERRUPT_PIPE) if ((pipe->Type() & USB_OBJECT_INTERRUPT_PIPE) != 0)
result = LinkInterruptQueueHead(queueHead, pipe); result = LinkInterruptQueueHead(queueHead, pipe);
else else
result = LinkQueueHead(queueHead); result = LinkQueueHead(queueHead);
@@ -803,7 +803,7 @@ EHCI::SubmitIsochronous(Transfer *transfer)
restSize); restSize);
// Find the entry where to start inserting the first Isochronous descriptor // Find the entry where to start inserting the first Isochronous descriptor
if (isochronousData->flags & USB_ISO_ASAP || if ((isochronousData->flags & USB_ISO_ASAP) != 0 ||
isochronousData->starting_frame_number == NULL) { isochronousData->starting_frame_number == NULL) {
if (fFirstIsochronousTransfer != NULL && fNextStartingFrame != -1) if (fFirstIsochronousTransfer != NULL && fNextStartingFrame != -1)
@@ -1430,7 +1430,7 @@ EHCI::AddPendingIsochronousTransfer(Transfer *transfer, ehci_itd **isoRequest,
status_t status_t
EHCI::CancelQueuedTransfers(Pipe *pipe, bool force) EHCI::CancelQueuedTransfers(Pipe *pipe, bool force)
{ {
if (pipe->Type() & USB_OBJECT_ISO_PIPE) if ((pipe->Type() & USB_OBJECT_ISO_PIPE) != 0)
return CancelQueuedIsochronousTransfers(pipe, force); return CancelQueuedIsochronousTransfers(pipe, force);
if (!Lock()) if (!Lock())
@@ -1648,8 +1648,8 @@ EHCI::FinishTransfers()
&& ((status >> EHCI_QTD_BYTES_SHIFT) & EHCI_QTD_BYTES_MASK) && ((status >> EHCI_QTD_BYTES_SHIFT) & EHCI_QTD_BYTES_MASK)
!=0) { !=0) {
// a short packet condition existed on this descriptor // a short packet condition existed on this descriptor
if (transfer->transfer->TransferPipe()->Type() if ((transfer->transfer->TransferPipe()->Type()
& USB_OBJECT_CONTROL_PIPE != 0) { & USB_OBJECT_CONTROL_PIPE) != 0) {
// for control pipes, the next descriptor // for control pipes, the next descriptor
// executed is the Status descriptor // executed is the Status descriptor
while (!(descriptor->next_phy & EHCI_ITEM_TERMINATE)) { while (!(descriptor->next_phy & EHCI_ITEM_TERMINATE)) {
@@ -1996,7 +1996,7 @@ EHCI::InitQueueHead(ehci_qh *queueHead, Pipe *pipe)
queueHead->endpoint_caps = (1 << EHCI_QH_CAPS_MULT_SHIFT); queueHead->endpoint_caps = (1 << EHCI_QH_CAPS_MULT_SHIFT);
if (pipe->Speed() != USB_SPEED_HIGHSPEED) { if (pipe->Speed() != USB_SPEED_HIGHSPEED) {
if (pipe->Type() & USB_OBJECT_CONTROL_PIPE) if ((pipe->Type() & USB_OBJECT_CONTROL_PIPE) != 0)
queueHead->endpoint_chars |= EHCI_QH_CHARS_CONTROL; queueHead->endpoint_chars |= EHCI_QH_CHARS_CONTROL;
queueHead->endpoint_caps |= (pipe->HubPort() << EHCI_QH_CAPS_PORT_SHIFT) queueHead->endpoint_caps |= (pipe->HubPort() << EHCI_QH_CAPS_PORT_SHIFT)