Changeset bd575647 in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2011-12-11T16:30:42Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7d5ef94

Parents:

2c202c5

Message:

libusbdev: Use shared hc_connection for pipes.

File:

• uspace/lib/usbdev/src/hub.c (modified) (7 diffs)

uspace/lib/usbdev/src/hub.c

@@ -63 +63 @@
         } while (false)
 
-/** Ask host controller for free address assignment.
- *
- * @param connection Opened connection to host controller.
- * @param preferred Preferred SUB address.
- * @param strict Fail if the preferred address is not avialable.
- * @param speed Speed of the new device (device that will be assigned
- *    the returned address).
- * @return Assigned USB address or negative error code.
- */
-usb_address_t usb_hc_request_address(usb_hc_connection_t *connection,
-    usb_address_t preferred, bool strict, usb_speed_t speed)
-{
-        CHECK_CONNECTION(connection);
-
-        async_exch_t *exch = async_exchange_begin(connection->hc_sess);
-        if (!exch)
-                return (usb_address_t)ENOMEM;
-
-        usb_address_t address = preferred;
-        const int ret = usbhc_request_address(exch, &address, strict, speed);
-
-        async_exchange_end(exch);
-        return ret == EOK ? address : ret;
-}
 
 /** Inform host controller about new device.
@@ -97 +73 @@
     const usb_hub_attached_device_t *attached_device)
 {
-        CHECK_CONNECTION(connection);
+//      CHECK_CONNECTION(connection);
         if (attached_device == NULL || attached_device->fun == NULL)
                 return EINVAL;
@@ -120 +96 @@
     usb_address_t address)
 {
-        CHECK_CONNECTION(connection);
+//      CHECK_CONNECTION(connection);
 
         async_exch_t *exch = async_exchange_begin(connection->hc_sess);
@@ -166 +142 @@
 
         /* TODO: prevent others from accessing the wire now. */
-        if (usb_pipe_unregister(pipe, hc_conn) != EOK) {
+        if (usb_pipe_unregister(pipe) != EOK) {
                 usb_log_warning(
                     "Failed to unregister the old pipe on address change.\n");
@@ -172 +148 @@
         /* The address is already changed so set it in the wire */
         pipe->wire->address = new_address;
-        rc = usb_pipe_register(pipe, 0, hc_conn);
+        rc = usb_pipe_register(pipe, 0);
         if (rc != EOK)
                 return EADDRNOTAVAIL;
@@ -288 +264 @@
 
         /* Register control pipe on default address. */
-        rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn);
+        rc = usb_pipe_register(&ctrl_pipe, 0);
         if (rc != EOK) {
                 rc = ENOTCONN;
@@ -385 +361 @@
 leave_release_free_address:
         /* This might be either 0:0 or dev_addr:0 */
-        if (usb_pipe_unregister(&ctrl_pipe, &hc_conn) != EOK)
+        if (usb_pipe_unregister(&ctrl_pipe) != EOK)
                 usb_log_warning("%s: Failed to unregister default pipe.\n",
                     __FUNCTION__);