Changeset 52fb76e in mainline

Timestamp:

2011-02-01T23:16:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2a11192

Parents:

3e9074f

Message:

Bare initialization of device connection struct

Location:

uspace/lib/usb

Files:

• include/usb/pipes.h (modified) (1 diff)
• src/pipes.c (modified) (1 diff)

uspace/lib/usb/include/usb/pipes.h

@@ -82 +82 @@
 int usb_device_connection_initialize_from_device(usb_device_connection_t *,
     device_t *);
+int usb_device_connection_initialize(usb_device_connection_t *,
+    devman_handle_t, usb_address_t);
 
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,

uspace/lib/usb/src/pipes.c

@@ -85 +85 @@
         }
 
-        connection->hc_handle = hc_handle;
-        connection->address = my_address;
+        rc = usb_device_connection_initialize(connection,
+            hc_handle, my_address);
+
+        return rc;
+}
+
+/** Initialize connection to USB device.
+ *
+ * @param connection Connection structure to be initialized.
+ * @param host_controller_handle Devman handle of host controller device is
+ *      connected to.
+ * @param device_address Device USB address.
+ * @return Error code.
+ */
+int usb_device_connection_initialize(usb_device_connection_t *connection,
+    devman_handle_t host_controller_handle, usb_address_t device_address)
+{
+        assert(connection);
+
+        if ((device_address < 0) || (device_address >= USB11_ADDRESS_MAX)) {
+                return EINVAL;
+        }
+
+        connection->hc_handle = host_controller_handle;
+        connection->address = device_address;
+
         return EOK;
 }
-
 
 /** Initialize USB endpoint pipe.