Changeset 9efad54 in mainline for uspace/lib/usbhost/include

Timestamp:

2018-01-06T21:15:48Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

56257ba

Parents:

c901632

Message:

usb: move endpoint descriptor parsing to HC

This better separates responsibilities. Now the device driver does not
care about the contents of an endpoint descriptor, and HC can parse the
values according to device's actual speed.

Currently, it is device driver's responsibility to fetch endpoint
descriptors, map them and register pipes - sending the endpoint
descriptor back to HC. HC then parses it, and fills the pipe
description, which then sends back to device driver. We shall probably
fetch the endpoint descriptor from inside the HC (also fixing the USB
spec violation of communication with EP0).

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bus.h (modified) (2 diffs)
• endpoint.h (modified) (3 diffs)

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

@@ -109 +109 @@
         int (*device_offline)(device_t *);                      /**< Optional */
         endpoint_t *(*device_find_endpoint)(device_t*, usb_target_t, usb_direction_t);
-        endpoint_t *(*endpoint_create)(device_t *, const usb_endpoint_desc_t *);
+        endpoint_t *(*endpoint_create)(device_t *, const usb_endpoint_descriptors_t *);
 
         /* Operations on endpoint */
@@ -163 +163 @@
     const char *);
 
-int bus_endpoint_add(device_t *, const usb_endpoint_desc_t *, endpoint_t **);
+int bus_endpoint_add(device_t *, const usb_endpoint_descriptors_t *, endpoint_t **);
 endpoint_t *bus_find_endpoint(device_t *, usb_target_t, usb_direction_t);
 int bus_endpoint_remove(endpoint_t *);

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

@@ -46 +46 @@
 #include <usb/usb.h>
 #include <usb/host/bus.h>
+#include <usbhc_iface.h>
 
 typedef struct bus bus_t;
@@ -59 +60 @@
         /** Reference count. */
         atomic_t refcnt;
-        /** Enpoint number */
-        usb_endpoint_t endpoint;
-        /** Communication direction. */
-        usb_direction_t direction;
-        /** USB transfer type. */
-        usb_transfer_type_t transfer_type;
-        /** Maximum size of data packets. */
-        size_t max_packet_size;
-        /** Additional opportunities per uframe */
-        unsigned packets;
         /** Reserved bandwidth. */
         size_t bandwidth;
@@ -80 +71 @@
         fibril_condvar_t avail;
 
+        /** Enpoint number */
+        usb_endpoint_t endpoint;
+        /** Communication direction. */
+        usb_direction_t direction;
+        /** USB transfer type. */
+        usb_transfer_type_t transfer_type;
+        /** Maximum size of one packet */
+        size_t max_packet_size;
+
+        /** Maximum size of one transfer */
+        size_t max_transfer_size;
+        /** Number of packats that can be sent in one service interval (not necessarily uframe) */
+        unsigned packets_per_uframe;
+
         /* This structure is meant to be extended by overriding. */
 } endpoint_t;
 
-extern void endpoint_init(endpoint_t *, device_t *, const usb_endpoint_desc_t *);
+extern void endpoint_init(endpoint_t *, device_t *, const usb_endpoint_descriptors_t *);
 
 extern void endpoint_add_ref(endpoint_t *);