Changeset a81a1d09 in mainline for uspace/lib/usbdev/src

Timestamp:

2011-05-11T16:49:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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

Location:

uspace/lib/usbdev/src

Files:

• altiface.c (moved) (moved from uspace/lib/usb/src/altiface.c )
• devdrv.c (moved) (moved from uspace/lib/usb/src/devdrv.c )
• devpoll.c (moved) (moved from uspace/lib/usb/src/devpoll.c )
• dp.c (moved) (moved from uspace/lib/usb/src/dp.c )
• hub.c (moved) (moved from uspace/lib/usb/src/hub.c ) (1 diff)
• pipepriv.c (moved) (moved from uspace/lib/usb/src/pipepriv.c )
• pipepriv.h (moved) (moved from uspace/lib/usb/src/pipepriv.h )
• pipes.c (moved) (moved from uspace/lib/usb/src/pipes.c ) (1 diff)
• pipesinit.c (moved) (moved from uspace/lib/usb/src/pipesinit.c )
• pipesio.c (moved) (moved from uspace/lib/usb/src/pipesio.c )
• recognise.c (moved) (moved from uspace/lib/usb/src/recognise.c )
• request.c (moved) (moved from uspace/lib/usb/src/request.c )
• usbdevice.c (moved) (moved from uspace/lib/usb/src/usbdevice.c ) (1 diff)

uspace/lib/usbdev/src/hub.c

@@ -117 +117 @@
             DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_RELEASE_ADDRESS, address);
+}
+
+/** Get handle of USB device with given address.
+ *
+ * @param[in] connection Opened connection to host controller.
+ * @param[in] address Address of device in question.
+ * @param[out] handle Where to write the device handle.
+ * @return Error code.
+ */
+int usb_hc_get_handle_by_address(usb_hc_connection_t *connection,
+    usb_address_t address, devman_handle_t *handle)
+{
+        CHECK_CONNECTION(connection);
+
+        sysarg_t tmp;
+        int rc = async_req_2_1(connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
+            address, &tmp);
+        if ((rc == EOK) && (handle != NULL)) {
+                *handle = tmp;
+        }
+
+        return rc;
 }
 

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/pipes.h>
 #include <usb/debug.h>
+#include <usb/driver.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>

uspace/lib/usbdev/src/usbdevice.c

@@ -37 +37 @@
 #include <usb_iface.h>
 #include <usb/usbdevice.h>
+#include <usb/driver.h>
 #include <usb/debug.h>
 #include <errno.h>
 #include <assert.h>
-
-/** Find host controller handle that is ancestor of given device.
- *
- * @param[in] device_handle Device devman handle.
- * @param[out] hc_handle Where to store handle of host controller
- *      controlling device with @p device_handle handle.
- * @return Error code.
- */
-int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
-{
-        int parent_phone = devman_parent_device_connect(device_handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        devman_handle_t h;
-        usb_log_debug("asking for HC handle (my handle is %zu).\n", device_handle);
-        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
-
-        async_hangup(parent_phone);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        if (hc_handle != NULL) {
-                *hc_handle = h;
-        }
-
-        return EOK;
-}
 
 /** Initialize connection to USB host controller.