Changeset b4b534ac in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -32 +32 @@
  * @brief UHCI driver USB transfer structure
  */
+
+#include <assert.h>
 #include <errno.h>
-#include <str_error.h>
 #include <macros.h>
+#include <mem.h>
+#include <stdlib.h>
 
 #include <usb/usb.h>
 #include <usb/debug.h>
+#include <usb/host/endpoint.h>
+#include <usb/host/utils/malloc32.h>
 
 #include "uhci_batch.h"
-#include "transfer_list.h"
 #include "hw_struct/transfer_descriptor.h"
-#include "utils/malloc32.h"
 
 #define DEFAULT_ERROR_COUNT 3
@@ -67 +70 @@
         assert(uhci_batch);
         assert(uhci_batch->usb_batch);
+        assert(!link_in_use(&uhci_batch->link));
         usb_transfer_batch_finish(uhci_batch->usb_batch,
             uhci_transfer_batch_data_buffer(uhci_batch));