Changes in uspace/lib/usbdev/src/pipes.c [79ae36dd:e8f826b] in mainline

File:

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

uspace/lib/usbdev/src/pipes.c

@@ -48 +48 @@
 /** Tell USB address assigned to given device.
  *
- * @param sess Session to parent device.
+ * @param phone Phone to parent device.
  * @param dev Device in question.
  * @return USB address or error code.
  */
-static usb_address_t get_my_address(async_sess_t *sess, ddf_dev_t *dev)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        
+static usb_address_t get_my_address(int phone, ddf_dev_t *dev)
+{
+        sysarg_t address;
+
         /*
          * We are sending special value as a handle - zero - to get
@@ -61 +61 @@
          * 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);
-        
-        if (rc != EOK)
+        int rc = async_req_2_1(phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_ADDRESS,
+            0, &address);
+
+        if (rc != EOK) {
                 return rc;
-        
+        }
+
         return (usb_address_t) address;
 }
@@ -80 +79 @@
 int usb_device_get_assigned_interface(ddf_dev_t *device)
 {
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
+        int parent_phone = devman_parent_device_connect(device->handle,
             IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        if (parent_phone < 0) {
                 return -1;
-        
-        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)
+        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_INTERFACE,
+            device->handle, &iface_no);
+
+        async_hangup(parent_phone);
+
+        if (rc != EOK) {
                 return -1;
-        
+        }
+
         return (int) iface_no;
 }
@@ -112 +110 @@
         assert(connection);
         assert(dev);
-        
+
         int rc;
         devman_handle_t hc_handle;
         usb_address_t my_address;
-        
+
         rc = usb_hc_find(dev->handle, &hc_handle);
-        if (rc != EOK)
+        if (rc != EOK) {
                 return rc;
-        
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
+        }
+
+        int parent_phone = devman_parent_device_connect(dev->handle,
             IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-        
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
         /*
          * Asking for "my" address may require several attempts.
@@ -138 +137 @@
          *  So, we need to wait for the HC to learn the binding.
          */
-        
         do {
-                my_address = get_my_address(parent_sess, dev);
-                
+                my_address = get_my_address(parent_phone, dev);
+
                 if (my_address == ENOENT) {
                         /* Be nice, let other fibrils run and try again. */
@@ -150 +148 @@
                         goto leave;
                 }
-        
+
         } while (my_address < 0);
-        
+
         rc = usb_device_connection_initialize(connection,
             hc_handle, my_address);
-        
+
 leave:
-        async_hangup(parent_sess);
+        async_hangup(parent_phone);
         return rc;
 }