Changeset 7aaed09 in mainline for uspace/lib/usbdev/src/pipes.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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 changes.

File:

• uspace/lib/usbdev/src/pipes.c (modified) (2 diffs)

uspace/lib/usbdev/src/pipes.c

@@ -54 +54 @@
 static usb_address_t get_my_address(async_sess_t *sess, const ddf_dev_t *dev)
 {
+        assert(sess);
         async_exch_t *exch = async_exchange_begin(sess);
-        
-        /*
-         * We are sending special value as a handle - zero - to get
-         * handle of the parent function (that handle was used
-         * when registering our device @p dev.
-         */
-        sysarg_t address;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS, 0, &address);
-        
+        if (!exch)
+                return ENOMEM;
+
+        usb_address_t address;
+        const int ret = usb_get_my_address(exch, &address);
+
         async_exchange_end(exch);
-        
-        if (rc != EOK)
-                return rc;
-        
-        return (usb_address_t) address;
+
+        return (ret == EOK) ? address : ret;
 }
 
@@ -76 +70 @@
  *
  * @param device Device in question.
- * @return Interface number (negative code means any).
+ * @return Error code (ENOTSUP means any).
  */
 int usb_device_get_assigned_interface(const ddf_dev_t *device)
 {
+        assert(device);
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_ATOMIC, device->handle,
             IPC_FLAG_BLOCKING);
         if (!parent_sess)
-                return -1;
-        
+                return ENOMEM;
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
-        sysarg_t iface_no;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_INTERFACE, device->handle, &iface_no);
-        
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return -1;
-        
-        return (int) iface_no;
+        if (!exch) {
+                async_hangup(parent_sess);
+                return ENOMEM;
+        }
+
+        int iface_no;
+        const int ret = usb_get_my_interface(exch, &iface_no);
+
+        return ret == EOK ? iface_no : ret;
 }