Changeset 6832245 in mainline for uspace/lib/usbhost/include/usb/host/endpoint.h

Timestamp:

2017-12-14T23:01:57Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

837d53d

Parents:

bd05140

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-14 23:01:54)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-14 23:01:57)

Message:

usbhost bus: refactor the bus ops

This way, method names better represent the entity it is working with.
Their semantics was shifted a bit.

Regarding the tree of structures:

bus ← device ← endpoint ← batch

Previously, devices were kept in DDF function nodes, and endpoints had
pointer to the bus and device. Now, devices have pointer to bus,
endpoints don't.

Pointer to hcd_t in bus is WIP, and will be removed.

File:

• uspace/lib/usbhost/include/usb/host/endpoint.h (modified) (4 diffs)

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -45 +45 @@
 #include <stdbool.h>
 #include <usb/usb.h>
+#include <usb/host/bus.h>
 
 typedef struct bus bus_t;
@@ -54 +55 @@
         /** Part of linked list. */
         link_t link;
-        /** Managing bus */
-        bus_t *bus;
+        /** USB device */
+        device_t *device;
         /** Reference count. */
         atomic_t refcnt;
-        /** USB device */
-        device_t *device;
         /** Enpoint number */
         usb_endpoint_t endpoint;
@@ -84 +83 @@
 } endpoint_t;
 
-extern void endpoint_init(endpoint_t *, bus_t *);
+extern void endpoint_init(endpoint_t *, device_t *, const usb_endpoint_desc_t *);
 
 extern void endpoint_add_ref(endpoint_t *);
@@ -103 +102 @@
 void endpoint_abort(endpoint_t *);
 
+/* Manage the toggle bit */
 extern int endpoint_toggle_get(endpoint_t *);
 extern void endpoint_toggle_set(endpoint_t *, bool);
+
+/* Calculate bandwidth */
+ssize_t endpoint_count_bw(endpoint_t *, size_t);
+
+static inline bus_t *endpoint_get_bus(endpoint_t *ep)
+{
+        return ep->device->bus;
+}
 
 /** list_get_instance wrapper.