Changeset 95c675b in mainline for uspace/lib/usbdev

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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 mainline

File:

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

uspace/lib/usbdev/src/devdrv.c

@@ -53 +53 @@
 
 /** USB device structure. */
-typedef struct usb_device {
+struct usb_device {
         /** Connection to device on USB bus */
         usb_dev_session_t *bus_session;
@@ -95 +95 @@
          */
         void *driver_data;
-} usb_device_t;
+};
 
 /** Count number of pipes the driver expects.
@@ -489 +489 @@
         int iface_no = -1;
 
-        async_sess_t *sess = devman_parent_device_connect(
-            ddf_dev_get_handle(ddf_dev), IPC_FLAG_BLOCKING);
+        async_sess_t *sess = ddf_dev_parent_sess_get(ddf_dev);
         if (sess == NULL)
                 return ENOMEM;
         const int ret = usb_device_get_info(sess, &h, &iface_no);
-        async_hangup(sess);
         if (ret != EOK)
                 return ret;