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

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

@@ -32 +32 @@
  * @brief OHCI driver
  */
+
+#include <assert.h>
+#include <macros.h>
+#include <mem.h>
+
+#include <usb/usb.h>
+#include <usb/host/utils/malloc32.h>
+
+#include "mem_access.h"
+
 #include "endpoint_descriptor.h"
 
@@ -48 +58 @@
  * @param td TD to put in the list.
  *
- * If @param ep is NULL, dummy ED is initalized with only skip flag set.
+ * If @param ep is NULL, dummy ED is initialized with only skip flag set.
  */
 void ed_init(ed_t *instance, const endpoint_t *ep, const td_t *td)
 {
         assert(instance);
-        memset(instance, 0, sizeof(ed_t));
+        memset(instance, 0, sizeof(*instance));
 
         if (ep == NULL) {
@@ -61 +71 @@
                 return;
         }
-        /* Non-dummy ED must have TD assigned */
+        /* Non-dummy ED must have corresponding EP and TD assigned */
         assert(td);
+        assert(ep);
+        assert(ep->direction < ARRAY_SIZE(dir));
 
         /* Status: address, endpoint nr, direction mask and max packet size. */
@@ -77 +89 @@
 
         /* Isochronous format flag */
+        // TODO: We need iTD instead of TD for iso transfers
         if (ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)
                 OHCI_MEM32_SET(instance->status, ED_STATUS_F_FLAG);