Changes in uspace/lib/usbdev/src/hub.c [49ce810:79ae36dd] in mainline

File:

• uspace/lib/usbdev/src/hub.c (modified) (5 diffs)

uspace/lib/usbdev/src/hub.c

@@ -42 +42 @@
 #include <usb/debug.h>
 #include <time.h>
+#include <async.h>
 
 /** How much time to wait between attempts to register endpoint 0:0.
@@ -71 +72 @@
 {
         CHECK_CONNECTION(connection);
-
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        
         sysarg_t address;
-        int rc = async_req_2_1(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
+        int rc = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_REQUEST_ADDRESS, speed,
             &address);
-        if (rc != EOK) {
+        
+        async_exchange_end(exch);
+        
+        if (rc != EOK)
                 return (usb_address_t) rc;
-        } else {
-                return (usb_address_t) address;
-        }
+        
+        return (usb_address_t) address;
 }
 
@@ -94 +98 @@
 {
         CHECK_CONNECTION(connection);
-        if (attached_device == NULL) {
+        
+        if (attached_device == NULL)
                 return EBADMEM;
-        }
-
-        return async_req_3_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        int rc = async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_BIND_ADDRESS,
             attached_device->address, attached_device->handle);
+        async_exchange_end(exch);
+        
+        return rc;
 }
 
@@ -114 +121 @@
 {
         CHECK_CONNECTION(connection);
-
-        return async_req_2_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
+        
+        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
+        int rc = async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_RELEASE_ADDRESS, address);
+        async_exchange_end(exch);
+        
+        return rc;
 }
 
@@ -192 +202 @@
         usb_hc_connection_t hc_conn = {
                 .hc_handle = connection->hc_handle,
-                .hc_phone = -1
+                .hc_sess = NULL
         };