Changes in uspace/lib/usb/src/pipes.c [bc1c6fb:e936e8e] in mainline

File:

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

uspace/lib/usb/src/pipes.c

@@ -35 +35 @@
 #include <usb/usb.h>
 #include <usb/pipes.h>
-#include <usb/debug.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>
-#include <devman.h>
 #include <errno.h>
 #include <assert.h>
@@ -48 +46 @@
  * @return USB address or error code.
  */
-static usb_address_t get_my_address(int phone, ddf_dev_t *dev)
+static usb_address_t get_my_address(int phone, device_t *dev)
 {
         sysarg_t address;
-
-
-        /*
-         * We are sending special value as a handle - zero - to get
-         * handle of the parent function (that handle was used
-         * when registering our device @p dev.
-         */
         int rc = async_req_2_1(phone, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_ADDRESS,
-            0, &address);
+            dev->handle, &address);
 
         if (rc != EOK) {
@@ -74 +65 @@
  * @return Interface number (negative code means any).
  */
-int usb_device_get_assigned_interface(ddf_dev_t *device)
+int usb_device_get_assigned_interface(device_t *device)
 {
         int parent_phone = devman_parent_device_connect(device->handle,
@@ -99 +90 @@
  *
  * @param connection Connection structure to be initialized.
- * @param dev Generic device backing the USB device.
+ * @param device Generic device backing the USB device.
  * @return Error code.
  */
 int usb_device_connection_initialize_from_device(
-    usb_device_connection_t *connection, ddf_dev_t *dev)
+    usb_device_connection_t *connection, device_t *device)
 {
         assert(connection);
-        assert(dev);
+        assert(device);
 
         int rc;
@@ -112 +103 @@
         usb_address_t my_address;
 
-        rc = usb_hc_find(dev->handle, &hc_handle);
+        rc = usb_hc_find(device->handle, &hc_handle);
         if (rc != EOK) {
                 return rc;
         }
 
-        int parent_phone = devman_parent_device_connect(dev->handle,
+        int parent_phone = devman_parent_device_connect(device->handle,
             IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
@@ -123 +114 @@
         }
 
-        my_address = get_my_address(parent_phone, dev);
+        my_address = get_my_address(parent_phone, device);
         if (my_address < 0) {
                 rc = my_address;