Changeset d824daf in mainline for uspace/lib

Timestamp:

2011-04-10T00:09:23Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

82e8861, edc4c66

Parents:

d32ed36 (diff), 1c258d1 (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:

Remove explicit reservation of default address

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (3 diffs)
• drv/include/usbhc_iface.h (modified) (1 diff)
• usb/include/usb/hub.h (modified) (1 diff)
• usb/src/hub.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -50 +50 @@
 static void remote_usbhc_control_write(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_read(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_reserve_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_release_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_request_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_bind_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -61 +59 @@
 /** Remote USB host controller interface operations. */
 static remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
-        remote_usbhc_reserve_default_address,
-        remote_usbhc_release_default_address,
-
         remote_usbhc_request_address,
         remote_usbhc_bind_address,
@@ -127 +122 @@
 
         return trans;
-}
-
-void remote_usbhc_reserve_default_address(ddf_fun_t *fun, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-
-        if (!usb_iface->reserve_default_address) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-        
-        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
-        
-        int rc = usb_iface->reserve_default_address(fun, speed);
-
-        async_answer_0(callid, rc);
-}
-
-void remote_usbhc_release_default_address(ddf_fun_t *fun, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-
-        if (!usb_iface->release_default_address) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        int rc = usb_iface->release_default_address(fun);
-
-        async_answer_0(callid, rc);
 }
 

uspace/lib/drv/include/usbhc_iface.h

@@ -84 +84 @@
  */
 typedef enum {
-        /** Reserve usage of default address.
-         * This call informs the host controller that the caller will be
-         * using default USB address. It is duty of the HC driver to ensure
-         * that only single entity will have it reserved.
-         * The address is returned via IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS.
-         * The caller can start using the address after receiving EOK
-         * answer.
-         */
-        IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS,
-
-        /** Release usage of default address.
-         * @see IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS
-         */
-        IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS,
-
         /** Asks for address assignment by host controller.
          * Answer:

uspace/lib/usb/include/usb/hub.h

@@ -59 +59 @@
 } usb_hc_attached_device_t;
 
-int usb_hc_reserve_default_address(usb_hc_connection_t *, usb_speed_t);
-int usb_hc_release_default_address(usb_hc_connection_t *);
-
 usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t);
 int usb_hc_register_device(usb_hc_connection_t *,

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);