Changes in uspace/lib/usbdev/src/pipes.c [56bdd9a4:9f7276d] in mainline

File:

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

uspace/lib/usbdev/src/pipes.c

@@ -52 +52 @@
  * @return USB address or error code.
  */
-static usb_address_t get_my_address(async_sess_t *sess, const ddf_dev_t *dev)
-{
-        assert(sess);
+static usb_address_t get_my_address(async_sess_t *sess, ddf_dev_t *dev)
+{
         async_exch_t *exch = async_exchange_begin(sess);
-        if (!exch)
-                return ENOMEM;
-
-        usb_address_t address;
-        const int ret = usb_get_my_address(exch, &address);
-
+        
+        /*
+         * 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);
+        
         async_exchange_end(exch);
-
-        return (ret == EOK) ? address : ret;
+        
+        if (rc != EOK)
+                return rc;
+        
+        return (usb_address_t) address;
 }
 
@@ -70 +76 @@
  *
  * @param device Device in question.
- * @return Error code (ENOTSUP means any).
- */
-int usb_device_get_assigned_interface(const ddf_dev_t *device)
-{
-        assert(device);
+ * @return Interface number (negative code means any).
+ */
+int usb_device_get_assigned_interface(ddf_dev_t *device)
+{
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_ATOMIC, device->handle,
             IPC_FLAG_BLOCKING);
         if (!parent_sess)
-                return ENOMEM;
-
+                return -1;
+        
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        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;
+        
+        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;
 }
 
@@ -100 +108 @@
  */
 int usb_device_connection_initialize_from_device(
-    usb_device_connection_t *connection, const ddf_dev_t *dev)
+    usb_device_connection_t *connection, ddf_dev_t *dev)
 {
         assert(connection);