Changeset b4b534ac in mainline for uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.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/ohci/hw_struct/transfer_descriptor.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c

@@ -32 +32 @@
  * @brief OHCI driver
  */
+
+#include <assert.h>
+#include <mem.h>
+
 #include <usb/usb.h>
-#include <mem.h>
-#include "../utils/malloc32.h"
+#include <usb/host/utils/malloc32.h>
+
+#include "completion_codes.h"
+#include "mem_access.h"
 #include "transfer_descriptor.h"
 
@@ -70 +76 @@
         }
 
-        /* Alow less data on input. */
+        /* Allow less data on input. */
         if (dir == USB_DIRECTION_IN) {
                 OHCI_MEM32_SET(instance->status, TD_STATUS_ROUND_FLAG);