Changeset a43f1d18 in mainline for uspace/app/usbinfo/dev.c

Timestamp:

2011-04-09T18:26:22Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

2ad98fd

Parents:

f35b294 (diff), 97e7e8a (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 with usb/development

File:

• uspace/app/usbinfo/dev.c (modified) (4 diffs)

uspace/app/usbinfo/dev.c

@@ -50 +50 @@
 
         int rc;
+        bool transfer_started = false;
 
         rc = usb_device_connection_initialize(&dev->wire, hc_handle, dev_addr);
@@ -76 +77 @@
         }
 
-        rc = usb_pipe_start_session(&dev->ctrl_pipe);
+        rc = usb_pipe_start_long_transfer(&dev->ctrl_pipe);
         if (rc != EOK) {
                 fprintf(stderr,
-                    NAME ": failed to start session on control pipe: %s.\n",
+                    NAME ": failed to start transfer on control pipe: %s.\n",
                     str_error(rc));
                 goto leave;
         }
+        transfer_started = true;
 
         rc = usb_request_get_device_descriptor(&dev->ctrl_pipe,
@@ -107 +109 @@
 
 leave:
-        if (usb_pipe_is_session_started(&dev->ctrl_pipe)) {
-                usb_pipe_end_session(&dev->ctrl_pipe);
+        if (transfer_started) {
+                usb_pipe_end_long_transfer(&dev->ctrl_pipe);
         }
 
@@ -118 +120 @@
 void destroy_device(usbinfo_device_t *dev)
 {
-        usb_pipe_end_session(&dev->ctrl_pipe);
+        usb_pipe_end_long_transfer(&dev->ctrl_pipe);
         free(dev);
 }