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

* Added force paramater to CancelQueuedIsochronousTransfers along with a TODO

Browse Source 
* Replaced space with tab


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23715 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2008-01-24 12:53:32 +00:00
parent f390945174
commit 2b5d39e859
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/uhci.cpp
+5 -2
View File
@@ -606,7 +606,7 @@ status_t
UHCI::CancelQueuedTransfers(Pipe *pipe, bool force) UHCI::CancelQueuedTransfers(Pipe *pipe, bool force)
{ {
if (pipe->Type() & USB_OBJECT_ISO_PIPE) if (pipe->Type() & USB_OBJECT_ISO_PIPE)
return CancelQueuedIsochronousTransfers(pipe); return CancelQueuedIsochronousTransfers(pipe, force);
if (!Lock()) if (!Lock())
return B_ERROR; return B_ERROR;
@@ -642,7 +642,7 @@ UHCI::CancelQueuedTransfers(Pipe *pipe, bool force)
status_t status_t
UHCI::CancelQueuedIsochronousTransfers(Pipe *pipe) UHCI::CancelQueuedIsochronousTransfers(Pipe *pipe, bool force)
{ {
isochronous_transfer_data *current = fFirstIsochronousTransfer; isochronous_transfer_data *current = fFirstIsochronousTransfer;
@@ -656,6 +656,9 @@ UHCI::CancelQueuedIsochronousTransfers(Pipe *pipe)
// the transfer. The FinishIsochronousThread will do the rest. // the transfer. The FinishIsochronousThread will do the rest.
for (int32 i = 0; i < packetCount; i++) for (int32 i = 0; i < packetCount; i++)
current->descriptors[i]->status &= ~TD_STATUS_ACTIVE; current->descriptors[i]->status &= ~TD_STATUS_ACTIVE;
// TODO: Use the force paramater in order to avoid calling
// invalid callbacks
current->is_active = false; current->is_active = false;
} }
src/add-ons/kernel/busses/usb/uhci.h
+2 -2
View File
@@ -91,8 +91,8 @@ public:
status_t Start(); status_t Start();
virtual status_t SubmitTransfer(Transfer *transfer); virtual status_t SubmitTransfer(Transfer *transfer);
virtual status_t CancelQueuedTransfers(Pipe *pipe, bool force); virtual status_t CancelQueuedTransfers(Pipe *pipe, bool force);
status_t CancelQueuedIsochronousTransfers(Pipe *pipe); status_t CancelQueuedIsochronousTransfers(Pipe *pipe, bool force);
status_t SubmitRequest(Transfer *transfer); status_t SubmitRequest(Transfer *transfer);
status_t SubmitIsochronous(Transfer *transfer); status_t SubmitIsochronous(Transfer *transfer);