Changeset 54464f6a in mainline for uspace/lib/usbdev/src/pipes.c

Timestamp:

2011-11-11T19:48:33Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

50a01a9

Parents:

c2e50d7 (diff), 747ef72 (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/usbdev/src/pipes.c (modified) (2 diffs)

uspace/lib/usbdev/src/pipes.c

@@ -56 +56 @@
         async_exch_t *exch = async_exchange_begin(sess);
         
-        /*
-         * 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.
-         */
         sysarg_t address;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS, 0, &address);
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_MY_ADDRESS, &address);
         
         async_exchange_end(exch);
@@ -80 +75 @@
 int usb_device_get_assigned_interface(const ddf_dev_t *device)
 {
+        assert(device);
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_ATOMIC, device->handle,