Changes in uspace/lib/usb/src/pipes.c [27a0012:563fb40] in mainline

File:

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

uspace/lib/usb/src/pipes.c

@@ -36 +36 @@
 #include <usb/pipes.h>
 #include <usbhc_iface.h>
-#include <usb_iface.h>
 #include <errno.h>
 #include <assert.h>
@@ -42 +41 @@
 /** Tell USB address assigned to given device.
  *
- * @param phone Phone to parent device.
+ * @param phone Phone to my HC.
  * @param dev Device in question.
  * @return USB address or error code.
@@ -49 +48 @@
 {
         sysarg_t address;
-        int rc = async_req_2_1(phone, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS,
+        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_ADDRESS,
             dev->handle, &address);
 
@@ -58 +57 @@
 
         return (usb_address_t) address;
-}
-
-/** Tell USB interface assigned to given device.
- *
- * @param device Device in question.
- * @return Interface number (negative code means any).
- */
-int usb_device_get_assigned_interface(device_t *device)
-{
-        int parent_phone = devman_parent_device_connect(device->handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return -1;
-        }
-
-        sysarg_t iface_no;
-        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;
 }
 
@@ -108 +80 @@
         }
 
-        int parent_phone = devman_parent_device_connect(device->handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        my_address = get_my_address(parent_phone, device);
+        int hc_phone = devman_device_connect(hc_handle, 0);
+        if (hc_phone < 0) {
+                return hc_phone;
+        }
+
+        my_address = get_my_address(hc_phone, device);
         if (my_address < 0) {
                 rc = my_address;
@@ -124 +95 @@
 
 leave:
-        async_hangup(parent_phone);
+        async_hangup(hc_phone);
         return rc;
 }