Changeset 925a21e in mainline for uspace/drv/bus/usb/ohci/ohci_endpoint.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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 mainline changes.

File:

• uspace/drv/bus/usb/ohci/ohci_endpoint.h (moved) (moved from uspace/drv/bus/usb/ohci/hcd_endpoint.h ) (3 diffs)

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

@@ -38 +38 @@
 #include <adt/list.h>
 #include <usb/host/endpoint.h>
+#include <usb/host/hcd.h>
 
 #include "hw_struct/endpoint_descriptor.h"
@@ -43 +44 @@
 
 /** Connector structure linking ED to to prepared TD. */
-typedef struct hcd_endpoint {
+typedef struct ohci_endpoint {
         /** OHCI endpoint descriptor */
         ed_t *ed;
@@ -50 +51 @@
         /** Linked list used by driver software */
         link_t link;
-} hcd_endpoint_t;
+        /** Device using this ep */
+        hcd_t *hcd;
+} ohci_endpoint_t;
 
-hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep);
-void hcd_endpoint_clear(endpoint_t *ep);
+int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
 
-/** Get and convert assigned hcd_endpoint_t structure
+/** Get and convert assigned ohci_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)
+static inline ohci_endpoint_t * ohci_endpoint_get(endpoint_t *ep)
 {
         assert(ep);