Changeset 8f30c2e in mainline

Timestamp:

2011-04-07T14:19:15Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

feb10c88

Parents:

fd3940c1

Message:

Force endpoint existence for all transfers

root hub polling time to 250ms

Location:

uspace/drv

Files:

• uhci-hcd/batch.c (modified) (1 diff)
• uhci-hcd/iface.c (modified) (5 diffs)
• uhci-rhd/root_hub.h (modified) (1 diff)

uspace/drv/uhci-hcd/batch.c

@@ -88 +88 @@
     )
 {
+        assert(ep);
         assert(func_in == NULL || func_out == NULL);
         assert(func_in != NULL || func_out != NULL);

uspace/drv/uhci-hcd/iface.c

@@ -232 +232 @@
         const size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
             size, ep->max_packet_size);
-        if (res_bw < bw)
-        {
+        if (res_bw < bw) {
                 usb_log_error("Endpoint(%d:%d) INT IN needs %zu bw "
                     "but only %zu is reserved.\n",
@@ -289 +288 @@
         const size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
             size, ep->max_packet_size);
-        if (res_bw < bw)
-        {
+        if (res_bw < bw) {
                 usb_log_error("Endpoint(%d:%d) INT IN needs %zu bw "
                     "but only %zu bw is reserved.\n",
@@ -429 +427 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        usb_speed_t speed =
-            usb_device_keeper_get_speed(&hc->manager, target.address);
-        usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
-            speed, target.address, target.endpoint, size, max_packet_size);
+
+        usb_log_debug("Control WRITE %d:%d %zu(%zu).\n",
+            target.address, target.endpoint, size, max_packet_size);
+
         endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_BOTH, NULL);
         if (ep == NULL) {
-                usb_log_warning("Endpoint(%d:%d) not registered for CONTROL.\n",
+                usb_log_error("Endpoint(%d:%d) not registered for CONTROL.\n",
                         target.address, target.endpoint);
-        }
+                return ENOENT;
+        }
+        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);
 
         if (setup_size != 8)
@@ -444 +447 @@
 
         usb_transfer_batch_t *batch =
-            batch_get(fun, target, USB_TRANSFER_CONTROL, max_packet_size, speed,
-                data, size, setup_data, setup_size, NULL, callback, arg, ep);
+            batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
+                ep->speed, data, size, setup_data, setup_size, NULL, callback,
+                arg, ep);
         if (!batch)
                 return ENOMEM;
@@ -478 +482 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        usb_speed_t speed =
-            usb_device_keeper_get_speed(&hc->manager, target.address);
-
-        usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
-            speed, target.address, target.endpoint, size, max_packet_size);
+
+        usb_log_debug("Control READ %d:%d %zu(%zu).\n",
+            target.address, target.endpoint, size, max_packet_size);
+
         endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_BOTH, NULL);
         if (ep == NULL) {
-                usb_log_warning("Endpoint(%d:%d) not registered for CONTROL.\n",
-                        target.address, target.endpoint);
-        }
+                usb_log_error("Endpoint(%d:%d) not registered for CONTROL.\n",
+                    target.address, target.endpoint);
+                return ENOENT;
+        }
+        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);
+
         usb_transfer_batch_t *batch =
-            batch_get(fun, target, USB_TRANSFER_CONTROL, max_packet_size, speed,
-                data, size, setup_data, setup_size, callback, NULL, arg, ep);
+            batch_get(fun, target, ep->transfer_type, ep->max_packet_size,
+                ep->speed, data, size, setup_data, setup_size,
+                callback, NULL, arg, ep);
         if (!batch)
                 return ENOMEM;

uspace/drv/uhci-rhd/root_hub.h

@@ -40 +40 @@
 
 #define UHCI_ROOT_HUB_PORT_COUNT 2
-#define ROOT_HUB_WAIT_USEC 5000000 /* 5 seconds */
+#define ROOT_HUB_WAIT_USEC 250000 /* 250 miliseconds */
 
 typedef struct root_hub {