Changeset c901632 in mainline

Timestamp:

2018-01-06T00:04: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:

9efad54

Parents:

3f42eab

Message:

usbdev: polling interval and interval is the same thing

Location:

uspace/lib

Files:

• drv/include/usb_iface.h (modified) (3 diffs)
• usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• usbdev/src/devdrv.c (modified) (1 diff)
• usbdev/src/pipes.c (modified) (1 diff)
• usbdev/src/pipesinit.c (modified) (1 diff)
• usbhost/src/ddf_helpers.c (modified) (1 diff)

uspace/lib/drv/include/usb_iface.h

@@ -100 +100 @@
 } usb_target_t;
 
-/** Description of usb endpoint.
+/** Description of an usb endpoint.
  */
 typedef struct {
@@ -108 +108 @@
         unsigned bytes_per_interval;
 } usb3_endpoint_desc_t;
-
-typedef struct {
-        unsigned polling_interval;
-} usb2_endpoint_desc_t;
 
 typedef struct usb_endpoint_desc {
@@ -133 +129 @@
         unsigned packets;
 
-        /** Bus version specific information */
-        usb2_endpoint_desc_t usb2;
+        /** Superspeed-specific information */
         usb3_endpoint_desc_t usb3;
 } usb_endpoint_desc_t;

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -106 +106 @@
     size_t, const uint8_t *, size_t, usb_dev_session_t *);
 
-int usb_pipe_register(usb_pipe_t *, unsigned);
+int usb_pipe_register(usb_pipe_t *);
 int usb_pipe_unregister(usb_pipe_t *);
 

uspace/lib/usbdev/src/devdrv.c

@@ -257 +257 @@
         for (size_t i = 0; i < pipe_count; i++) {
                 if (pipes[i].present) {
-                        rc = usb_pipe_register(&pipes[i].pipe,
-                            pipes[i].descriptor->poll_interval);
+                        rc = usb_pipe_register(&pipes[i].pipe);
                         if (rc != EOK) {
                                 goto rollback_unregister_endpoints;

uspace/lib/usbdev/src/pipes.c

@@ -316 +316 @@
  * @return Error code.
  */
-int usb_pipe_register(usb_pipe_t *pipe, unsigned interval)
+int usb_pipe_register(usb_pipe_t *pipe)
 {
         assert(pipe);
         assert(pipe->bus_session);
 
-        pipe->desc.usb2.polling_interval = interval;
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         if (!exch)

uspace/lib/usbdev/src/pipesinit.c

@@ -178 +178 @@
         };
 
-        /* TODO Extract USB2-related information */
-        ep_desc->usb2 = (usb2_endpoint_desc_t) { 0 };
-
         if (companion_desc) {
                 ep_desc->usb3 = (usb3_endpoint_desc_t) {

uspace/lib/usbhost/src/ddf_helpers.c

@@ -79 +79 @@
                 usb_str_transfer_type(endpoint_desc->transfer_type),
                 usb_str_direction(endpoint_desc->direction),
-                endpoint_desc->max_packet_size, endpoint_desc->usb2.polling_interval);
+                endpoint_desc->max_packet_size, endpoint_desc->interval);
 
         return bus_endpoint_add(dev, endpoint_desc, NULL);