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

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

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

uspace/lib/usbdev/src/devdrv.c

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup libusbdev
  * @{
@@ -55 +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.
+         *
          * This is an array of other endpoint pipes in the same order as
          * in usb_driver_t.
          */
         usb_endpoint_mapping_t *pipes;
+        
         /** Number of other endpoint pipes. */
         size_t pipes_count;
+        
         /** Current interface.
+         *
          * Usually, drivers operate on single interface only.
          * This item contains the value of the interface or -1 for any.
          */
         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.
+         *
          * Do not use the entry in generic device, that is already used
          * by the framework.
          */
         void *driver_data;
-
 } usb_device_t;
 
@@ -135 +146 @@
                 return rc;
         }
-
+        
         /* Change current alternative */
         usb_dev->alternate_interfaces.current = alternate_setting;
@@ -279 +290 @@
  *
  * @param[in] usb_dev USB device.
+ *
  */
 void usb_device_destroy_pipes(usb_device_t *usb_dev)
@@ -284 +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) {
@@ -291 +304 @@
                         usb_pipe_unregister(&usb_dev->pipes[i].pipe);
         }
+        
         free(usb_dev->pipes);
         usb_dev->pipes = NULL;
@@ -448 +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) {
@@ -459 +475 @@
                 }
         }
+        
         async_exchange_end(exch);
         return ret;