Changeset 4fe3b6d in mainline for uspace/drv/ohci/hcd_endpoint.h

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 with development

File:

• uspace/drv/ohci/hcd_endpoint.h (modified) (2 diffs)

uspace/drv/ohci/hcd_endpoint.h

@@ -37 +37 @@
 #include <assert.h>
 #include <adt/list.h>
-
 #include <usb/host/endpoint.h>
 
@@ -43 +42 @@
 #include "hw_struct/transfer_descriptor.h"
 
+/** Connector structure linking ED to to prepared TD. */
 typedef struct hcd_endpoint {
+        /** OHCI endpoint descriptor */
         ed_t *ed;
+        /** Currently enqueued transfer descriptor */
         td_t *td;
+        /** Linked list used by driver software */
         link_t link;
 } hcd_endpoint_t;
 
 hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep);
+void hcd_endpoint_clear(endpoint_t *ep);
 
-hcd_endpoint_t * hcd_endpoint_get(endpoint_t *ep);
+/** Get and convert assigned hcd_endpoint_t structure
+ * @param[in] ep USBD endpoint structure.
+ * @return Pointer to assigned hcd endpoint structure
+ */
+static inline hcd_endpoint_t * hcd_endpoint_get(endpoint_t *ep)
+{
+        assert(ep);
+        return ep->hc_data.data;
+}
 
-void hcd_endpoint_clear(endpoint_t *ep);
 #endif
 /**