Changeset fb4d788 in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (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 the mainline

File:

• uspace/lib/usbdev/src/hub.c (modified) (5 diffs)

uspace/lib/usbdev/src/hub.c

@@ -151 +151 @@
  * @retval EADDRNOTAVAIL Failed retrieving free address from host controller.
  * @retval EBUSY Failed reserving default USB address.
- * @retval ENOTCONN Problem connecting to the host controller via USB pipe.
+ * @retval ENXIO Problem connecting to the host controller via USB pipe.
  * @retval ESTALL Problem communication with device (either SET_ADDRESS
  *      request or requests for descriptors when creating match ids).
@@ -184 +184 @@
             &dev_conn, hc_conn, USB_ADDRESS_DEFAULT);
         if (rc != EOK) {
-                rc = ENOTCONN;
+                rc = ENXIO;
                 goto leave_release_free_address;
         }
@@ -192 +192 @@
         rc = usb_pipe_initialize_default_control(&ctrl_pipe, &dev_conn);
         if (rc != EOK) {
-                rc = ENOTCONN;
+                rc = ENXIO;
                 goto leave_release_free_address;
         }
@@ -217 +217 @@
         rc = usb_pipe_register(&ctrl_pipe, 0);
         if (rc != EOK) {
-                rc = ENOTCONN;
+                rc = ENXIO;
                 goto leave_release_default_address;
         }
@@ -278 +278 @@
         if (rc != EOK) {
                 /* The child function is already created. */
-                rc = EDESTADDRREQ;
+                rc = EIO;
                 goto leave_release_free_address;
         }