Changes in uspace/lib/usb/src/hc.c [79ae36dd:e8f826b] in mainline

File:

• uspace/lib/usb/src/hc.c (modified) (7 diffs)

uspace/lib/usb/src/hc.c

@@ -81 +81 @@
 
         connection->hc_handle = hc_handle;
-        connection->hc_sess = NULL;
+        connection->hc_phone = -1;
 
         return EOK;
@@ -94 +94 @@
 {
         assert(connection);
-        
-        if (usb_hc_connection_is_opened(connection))
+
+        if (usb_hc_connection_is_opened(connection)) {
                 return EBUSY;
-        
-        async_sess_t *sess = devman_device_connect(EXCHANGE_SERIALIZE,
-            connection->hc_handle, 0);
-        if (!sess)
-                return ENOMEM;
-        
-        connection->hc_sess = sess;
+        }
+
+        int phone = devman_device_connect(connection->hc_handle, 0);
+        if (phone < 0) {
+                return phone;
+        }
+
+        connection->hc_phone = phone;
+
         return EOK;
 }
@@ -115 +117 @@
 {
         assert(connection);
-        return (connection->hc_sess != NULL);
+
+        return (connection->hc_phone >= 0);
 }
 
@@ -131 +134 @@
         }
 
-        int rc = async_hangup(connection->hc_sess);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        connection->hc_sess = NULL;
+        int rc = async_hangup(connection->hc_phone);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        connection->hc_phone = -1;
 
         return EOK;
@@ -151 +154 @@
     usb_address_t address, devman_handle_t *handle)
 {
-        if (!usb_hc_connection_is_opened(connection))
+        if (!usb_hc_connection_is_opened(connection)) {
                 return ENOENT;
-        
-        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
-        
+        }
+
         sysarg_t tmp;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+        int rc = async_req_2_1(connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
             address, &tmp);
-        
-        async_exchange_end(exch);
-        
-        if ((rc == EOK) && (handle != NULL))
+        if ((rc == EOK) && (handle != NULL)) {
                 *handle = tmp;
-        
+        }
+
         return rc;
 }
@@ -176 +177 @@
 usb_address_t usb_hc_get_address_by_handle(devman_handle_t dev_handle)
 {
-        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;
-        
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-        
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
         sysarg_t address;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+
+        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_ADDRESS,
             dev_handle, &address);
-        
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        async_hangup(parent_phone);
+
         return (usb_address_t) address;
 }
@@ -240 +240 @@
 int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
 {
-        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)
-                return ENOMEM;
-        
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-        
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
         devman_handle_t h;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
-        
-        async_exchange_end(exch);
-        async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
-        if (hc_handle != NULL)
+
+        async_hangup(parent_phone);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (hc_handle != NULL) {
                 *hc_handle = h;
-        
+        }
+
         return EOK;
 }