Changeset 2c202c5 in mainline for uspace/lib/usb/src

Timestamp:

2011-12-11T15:17:43Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bd575647

Parents:

a045ab1

Message:

libusb: Add device_connection_t.

Location:

uspace/lib/usb/src

Files:

• ddfiface.c (modified) (1 diff)
• dev.c (modified) (2 diffs)
• hc.c (modified) (1 diff)
• resolve.c (modified) (1 diff)

uspace/lib/usb/src/ddfiface.c

@@ -68 +68 @@
 {
         assert(fun);
-        return usb_find_hc(fun->handle, handle);
+        return usb_get_hc_by_handle(fun->handle, handle);
 }
 

uspace/lib/usb/src/dev.c

@@ -68 +68 @@
  * @return Error code.
  */
-int usb_find_hc(devman_handle_t device_handle, devman_handle_t *hc_handle)
+int usb_get_hc_by_handle(devman_handle_t device_handle,
+    devman_handle_t *hc_handle)
 {
         async_sess_t *parent_sess =
@@ -88 +89 @@
         return ret;
 }
+/*----------------------------------------------------------------------------*/
+int usb_device_connection_initialize(usb_device_connection_t *connection,
+    usb_hc_connection_t *hc_connection, usb_address_t address)
+{
+        assert(connection);
+
+        if (hc_connection == NULL) {
+                return EBADMEM;
+        }
+
+        if ((address < 0) || (address >= USB11_ADDRESS_MAX)) {
+                return EINVAL;
+        }
+
+        connection->hc_connection = hc_connection;
+        connection->address = address;
+        return EOK;
+}

uspace/lib/usb/src/hc.c

@@ -114 +114 @@
 
         devman_handle_t hc_handle;
-        const int rc = usb_find_hc(device->handle, &hc_handle);
+        const int rc = usb_get_hc_by_handle(device->handle, &hc_handle);
         if (rc == EOK) {
                 usb_hc_connection_initialize(connection, hc_handle);

uspace/lib/usb/src/resolve.c

@@ -185 +185 @@
                 /* Try to find its host controller. */
                 if (!found_hc) {
-                        rc = usb_find_hc(tmp_handle, &hc_handle);
+                        rc = usb_get_hc_by_handle(tmp_handle, &hc_handle);
                         if (rc == EOK) {
                                 found_hc = true;