Changeset fbf0589 in mainline for uspace/lib/usb/src/pipes.c

Timestamp:

2011-02-18T20:37:04Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0a46c41e

Parents:

026d6e2 (diff), 374552ef (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 development/ changes

File:

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

uspace/lib/usb/src/pipes.c

@@ -35 +35 @@
 #include <usb/usb.h>
 #include <usb/pipes.h>
+#include <usbhc_iface.h>
 #include <errno.h>
 #include <assert.h>
-#include <usb/usbdrv.h>
+
+/** Tell USB address assigned to given device.
+ *
+ * @param phone Phone to my HC.
+ * @param dev Device in question.
+ * @return USB address or error code.
+ */
+static usb_address_t get_my_address(int phone, device_t *dev)
+{
+        sysarg_t address;
+        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_ADDRESS,
+            dev->handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        return (usb_address_t) address;
+}
 
 /** Initialize connection to USB device.
@@ -55 +75 @@
         usb_address_t my_address;
 
-        rc = usb_drv_find_hc(device, &hc_handle);
+        rc = usb_hc_find(device->handle, &hc_handle);
         if (rc != EOK) {
                 return rc;
@@ -65 +85 @@
         }
 
-        my_address = usb_drv_get_my_address(hc_phone, device);
+        my_address = get_my_address(hc_phone, device);
         if (my_address < 0) {
                 rc = my_address;