Changeset 5410c04 in mainline for uspace/lib/usb/src/devdrv.c

Timestamp:

2011-04-09T16:11:41Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a9d67aa, c6394aa

Parents:

8e8b84f (diff), 7b715892 (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:

Automatic pipe sessions

It is no longer necessary to start sessions on USB pipes manually.
Actually, the original functions usb_pipe_start/end_session are now
deprecated.

For sporadic transfers, you do not need to care about sessions at all.
For longer transfers, you may hint the library about it by calling
usb_pipe_start_long_transfer.

File:

• uspace/lib/usb/src/devdrv.c (modified) (4 diffs)

uspace/lib/usb/src/devdrv.c

@@ -239 +239 @@
 
         /*
-         * For further actions, we need open session on default control pipe.
+         * We will do some querying of the device, it is worth to prepare
+         * the long transfer.
          */
-        rc = usb_pipe_start_session(&dev->ctrl_pipe);
-        if (rc != EOK) {
-                usb_log_error("Failed to start an IPC session: %s.\n",
+        rc = usb_pipe_start_long_transfer(&dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Failed to start transfer: %s.\n",
                     str_error(rc));
                 return rc;
@@ -252 +253 @@
             &dev->descriptors.device);
         if (rc != EOK) {
+                usb_pipe_end_long_transfer(&dev->ctrl_pipe);
                 usb_log_error("Failed to retrieve device descriptor: %s.\n",
                     str_error(rc));
@@ -262 +264 @@
             &dev->descriptors.configuration_size);
         if (rc != EOK) {
+                usb_pipe_end_long_transfer(&dev->ctrl_pipe);
                 usb_log_error("Failed retrieving configuration descriptor: %s. %s\n",
                     dev->ddf_dev->name, str_error(rc));
@@ -271 +274 @@
         }
 
-        /* No checking here. */
-        usb_pipe_end_session(&dev->ctrl_pipe);
+        usb_pipe_end_long_transfer(&dev->ctrl_pipe);
 
         /* Rollback actions. */