Changeset 7aaed09 in mainline for uspace/lib/usb/src/hc.c

Timestamp:

2011-12-18T14:02:30Z (13 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/usb/src/hc.c (modified) (4 diffs)

uspace/lib/usb/src/hc.c

@@ -153 +153 @@
         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),
-            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
-            address, &tmp);
-        
+        if (!exch)
+                return ENOMEM;
+        const int ret = usbhc_get_handle(exch, address, handle);
         async_exchange_end(exch);
-        
-        if ((rc == EOK) && (handle != NULL))
-                *handle = tmp;
-        
-        return rc;
+        return ret;
 }
 
@@ -174 +167 @@
  * @return USB address or negative error code.
  */
-usb_address_t usb_hc_get_address_by_handle(devman_handle_t dev_handle)
+usb_address_t usb_get_address_by_handle(devman_handle_t dev_handle)
 {
         async_sess_t *parent_sess =
@@ -181 +174 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
-        sysarg_t address;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS,
-            dev_handle, &address);
-        
+        if (!exch) {
+                async_hangup(parent_sess);
+                return ENOMEM;
+        }
+        usb_address_t address;
+        const int ret = usb_get_my_address(exch, &address);
+
         async_exchange_end(exch);
         async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
-        return (usb_address_t) address;
+
+        if (ret != EOK)
+                return ret;
+
+        return address;
 }
 
@@ -232 +226 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
-        devman_handle_t h;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
-        
+        if (!exch) {
+                async_hangup(parent_sess);
+                return ENOMEM;
+        }
+        const int ret = usb_get_hc_handle(exch, hc_handle);
+
         async_exchange_end(exch);
         async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
-        if (hc_handle != NULL)
-                *hc_handle = h;
-        
-        return EOK;
+
+        return ret;
 }