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

uspace/drv/bus/usb/ohci/ohci_endpoint.c

@@ -32 +32 @@
  * @brief OHCI driver
  */
-#include "utils/malloc32.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <usb/host/utils/malloc32.h>
+
 #include "ohci_endpoint.h"
 #include "hc.h"
@@ -87 +91 @@
         }
 
+        link_initialize(&ohci_ep->link);
         ed_init(ohci_ep->ed, ep, ohci_ep->td);
         endpoint_set_hc_data(
             ep, ohci_ep, ohci_ep_toggle_get, ohci_ep_toggle_set);
-        hc_enqueue_endpoint(hcd->private_data, ep);
+        hc_enqueue_endpoint(hcd_get_driver_data(hcd), ep);
         return EOK;
 }
@@ -104 +109 @@
         assert(ep);
         ohci_endpoint_t *instance = ohci_endpoint_get(ep);
-        hc_dequeue_endpoint(hcd->private_data, ep);
+        hc_dequeue_endpoint(hcd_get_driver_data(hcd), ep);
+        endpoint_clear_hc_data(ep);
         if (instance) {
                 free32(instance->ed);
@@ -110 +116 @@
                 free(instance);
         }
-        endpoint_clear_hc_data(ep);
 }
 /**