Changeset 1998bcd in mainline for uspace/drv

Timestamp:

2011-04-08T22:25:00Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98064795

Parents:

297341b

Message:

Endpoint registration sends address as well

This is the first step towards using endpoint registration instead
of reservation of default address.

Location:

uspace/drv

Files:

• ehci-hcd/hc_iface.c (modified) (2 diffs)
• ohci/iface.c (modified) (4 diffs)
• uhci-hcd/iface.c (modified) (4 diffs)

uspace/drv/ehci-hcd/hc_iface.c

@@ -123 +123 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] address USB address of the device.
+ * @param[in] speed Endpoint speed (invalid means to use device one).
  * @param[in] endpoint Endpoint number.
  * @param[in] transfer_type USB transfer type.
@@ -131 +132 @@
  */
 static int register_endpoint(ddf_fun_t *fun,
-    usb_address_t address, usb_endpoint_t endpoint,
+    usb_address_t address, usb_speed_t speed, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)

uspace/drv/ohci/iface.c

@@ -139 +139 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] address USB address of the device.
+ * @param[in] ep_speed Endpoint speed (invalid means to use device one).
  * @param[in] endpoint Endpoint number.
  * @param[in] transfer_type USB transfer type.
@@ -146 +147 @@
  * @return Error code.
  */
-static int register_endpoint(
-    ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint,
+static int register_endpoint(ddf_fun_t *fun,
+    usb_address_t address, usb_speed_t ep_speed, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)
@@ -156 +157 @@
         if (address == hc->rh.address)
                 return EOK;
-        const usb_speed_t speed =
-                usb_device_keeper_get_speed(&hc->manager, address);
+        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
+        if (speed >= USB_SPEED_MAX) {
+                speed = ep_speed;
+        }
         const size_t size = max_packet_size;
         usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
@@ -183 +186 @@
         usb_log_debug("Unregister endpoint %d:%d %d.\n",
             address, endpoint, direction);
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
+            address, endpoint, direction, NULL);
+        if (ep != NULL) {
+                usb_device_keeper_del_ep(&hc->manager, address, ep);
+        }
         return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
             endpoint, direction);

uspace/drv/uhci-hcd/iface.c

@@ -74 +74 @@
             name, target.address, target.endpoint, size, ep->max_packet_size);
 
-        assert(ep->speed ==
-            usb_device_keeper_get_speed(&(*hc)->manager, target.address));
+//      assert(ep->speed ==
+//          usb_device_keeper_get_speed(&(*hc)->manager, target.address));
 //      assert(ep->max_packet_size == max_packet_size);
 //      assert(ep->transfer_type == USB_TRANSFER_CONTROL);
@@ -198 +198 @@
 /*----------------------------------------------------------------------------*/
 static int register_endpoint(
-    ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint,
+    ddf_fun_t *fun, usb_address_t address, usb_speed_t ep_speed,
+    usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
     size_t max_packet_size, unsigned int interval)
@@ -204 +205 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        const usb_speed_t speed =
-            usb_device_keeper_get_speed(&hc->manager, address);
+        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
+        if (speed >= USB_SPEED_MAX) {
+                speed = ep_speed;
+        }
         const size_t size =
             (transfer_type == USB_TRANSFER_INTERRUPT
@@ -243 +246 @@
         usb_log_debug("Unregister endpoint %d:%d %d.\n",
             address, endpoint, direction);
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
+            address, endpoint, direction, NULL);
+        if (ep != NULL) {
+                usb_device_keeper_del_ep(&hc->manager, address, ep);
+        }
         return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
             endpoint, direction);