Changeset 816f5f4 in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2017-10-15T16:55:48Z (7 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

9b2f69e

Parents:

2770b66

Message:

Remote USB (async) sending structures

remote_usb_register_endpoint is now sending a whole new structure, instead of 5 numeric arguments pulled out of structure.
This allows future extensibility for the structure as well as a working code to be used for other remote async calls.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (10 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -56 +56 @@
         /** Connection to device on USB bus */
         usb_dev_session_t *bus_session;
-        
+
         /** devman handle */
         devman_handle_t handle;
-        
+
         /** The default control pipe. */
         usb_pipe_t ctrl_pipe;
-        
+
         /** Other endpoint pipes.
          *
@@ -69 +69 @@
          */
         usb_endpoint_mapping_t *pipes;
-        
+
         /** Number of other endpoint pipes. */
         size_t pipes_count;
-        
+
         /** Current interface.
          *
@@ -79 +79 @@
          */
         int interface_no;
-        
+
         /** Alternative interfaces. */
         usb_alternate_interfaces_t alternate_interfaces;
-        
+
         /** Some useful descriptors for USB device. */
         usb_device_descriptors_t descriptors;
-        
+
         /** Generic DDF device backing this one. DO NOT TOUCH! */
         ddf_dev_t *ddf_dev;
-        
+
         /** Custom driver data.
          *
@@ -146 +146 @@
                 return rc;
         }
-        
+
         /* Change current alternative */
         usb_dev->alternate_interfaces.current = alternate_setting;
@@ -296 +296 @@
         assert(usb_dev);
         assert(usb_dev->pipes || usb_dev->pipes_count == 0);
-        
+
         /* Destroy the pipes. */
         for (size_t i = 0; i < usb_dev->pipes_count; ++i) {
@@ -304 +304 @@
                         usb_pipe_unregister(&usb_dev->pipes[i].pipe);
         }
-        
+
         free(usb_dev->pipes);
         usb_dev->pipes = NULL;
@@ -332 +332 @@
         assert(usb_dev);
         for (unsigned i = 0; i < usb_dev->pipes_count; ++i) {
-                if (usb_dev->pipes[i].pipe.endpoint_no == ep)
+                if (usb_dev->pipes[i].pipe.desc.endpoint_no == ep)
                         return &usb_dev->pipes[i];
         }
@@ -462 +462 @@
         assert(handle);
         assert(iface_no);
-        
+
         async_exch_t *exch = async_exchange_begin(sess);
         if (!exch)
                 return EPARTY;
-        
+
         int ret = usb_get_my_device_handle(exch, handle);
         if (ret == EOK) {
@@ -475 +475 @@
                 }
         }
-        
+
         async_exchange_end(exch);
         return ret;
@@ -504 +504 @@
                 return ENOMEM;
         }
-        
+
         return usb_device_init(usb_dev, ddf_dev, desc, err, h, iface_no);
 }