Changeset 4ede178 in mainline

Timestamp:

2011-04-09T15:58:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8efafda

Parents:

e9ce696

Message:

No start/end pipe session calls in libusb

Location:

uspace/lib/usb/src

Files:

• devdrv.c (modified) (4 diffs)
• devpoll.c (modified) (1 diff)
• hub.c (modified) (2 diffs)
• pipesinit.c (modified) (2 diffs)
• recognise.c (modified) (1 diff)

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. */

uspace/lib/usb/src/devpoll.c

@@ -77 +77 @@
                 int rc;
 
-                rc = usb_pipe_start_session(pipe);
-                if (rc != EOK) {
-                        failed_attempts++;
-                        continue;
-                }
-
                 size_t actual_size;
                 rc = usb_pipe_read(pipe, polling_data->buffer,
                     polling_data->request_size, &actual_size);
 
-                /* Quit the session regardless of errors. */
-                usb_pipe_end_session(pipe);
                 
 //              if (rc == ESTALL) {

uspace/lib/usb/src/hub.c

@@ -287 +287 @@
         }
 
-        rc = usb_pipe_start_session(&ctrl_pipe);
-        if (rc != EOK) {
-                rc = ENOTCONN;
-                goto leave_unregister_endpoint;
-        }
-
         rc = usb_request_set_address(&ctrl_pipe, dev_addr);
         if (rc != EOK) {
@@ -298 +292 @@
                 goto leave_stop_session;
         }
-
-        usb_pipe_end_session(&ctrl_pipe);
 
         /*

uspace/lib/usb/src/pipesinit.c

@@ -416 +416 @@
         int rc;
 
-        TRY_LOOP(failed_attempts) {
-                rc = usb_pipe_start_session(pipe);
-                if (rc == EOK) {
-                        break;
-                }
-        }
+        rc = usb_pipe_start_long_transfer(pipe);
         if (rc != EOK) {
                 return rc;
@@ -442 +437 @@
                 }
         }
-        usb_pipe_end_session(pipe);
+        usb_pipe_end_long_transfer(pipe);
         if (rc != EOK) {
                 return rc;

uspace/lib/usb/src/recognise.c

@@ -404 +404 @@
         child->driver_data = dev_data;
 
-        rc = usb_pipe_start_session(&ctrl_pipe);
-        if (rc != EOK) {
-                goto failure;
-        }
-
         rc = usb_device_create_match_ids(&ctrl_pipe, &child->match_ids);
-        if (rc != EOK) {
-                goto failure;
-        }
-
-        rc = usb_pipe_end_session(&ctrl_pipe);
         if (rc != EOK) {
                 goto failure;