Changeset edc4c66 in mainline for uspace/lib/usb/src/hub.c

Timestamp:

2011-04-10T08:16:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

86b4ee0

Parents:

a19a2d7 (diff), d824daf (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:

Development branch changes

File:

• uspace/lib/usb/src/hub.c (modified) (3 diffs)

uspace/lib/usb/src/hub.c

@@ -42 +42 @@
 #include <usb/debug.h>
 
+/** How much time to wait between attempts to register endpoint 0:0.
+ * The value is based on typical value for port reset + some overhead.
+ */
+#define ENDPOINT_0_0_REGISTER_ATTEMPT_DELAY_USEC (1000 * (10 + 2))
+
 /** Check that HC connection is alright.
  *
@@ -53 +58 @@
                 } \
         } while (false)
-
-
-/** Tell host controller to reserve default address.
- * @deprecated
- *
- * @param connection Opened connection to host controller.
- * @param speed Speed of the device that will respond on the default address.
- * @return Error code.
- */
-int usb_hc_reserve_default_address(usb_hc_connection_t *connection,
-    usb_speed_t speed)
-{
-        CHECK_CONNECTION(connection);
-
-        usb_log_warning("usb_hc_reserve_default_address() considered obsolete");
-
-        return async_req_2_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS, speed);
-}
-
-/** Tell host controller to release default address.
- * @deprecated
- *
- * @param connection Opened connection to host controller.
- * @return Error code.
- */
-int usb_hc_release_default_address(usb_hc_connection_t *connection)
-{
-        CHECK_CONNECTION(connection);
-
-        usb_log_warning("usb_hc_release_default_address() considered obsolete");
-
-        return async_req_1_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
-}
 
 /** Ask host controller for free address assignment.
@@ -269 +237 @@
                 if (rc != EOK) {
                         /* Do not overheat the CPU ;-). */
-                        async_usleep(10);
+                        async_usleep(ENDPOINT_0_0_REGISTER_ATTEMPT_DELAY_USEC);
                 }
         } while (rc != EOK);