Changeset 391d55b in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-04-06T18:27:49Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5876d36

Parents:

6ce42e85

Message:

Add interrupt bandwidth checks

File:

• uspace/drv/uhci-hcd/iface.c (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -194 +194 @@
             target.address, target.endpoint, size, max_packet_size);
 
+        size_t res_bw;
         endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
-            target.address, target.endpoint, USB_DIRECTION_OUT, NULL);
+            target.address, target.endpoint, USB_DIRECTION_OUT, &res_bw);
         if (ep == NULL) {
                 usb_log_error("Endpoint(%d:%d) not registered for INT OUT.\n",
                         target.address, target.endpoint);
+                return ENOENT;
+        }
+        const size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
+            size, ep->max_packet_size);
+        if (res_bw < bw)
+        {
+                usb_log_error("Endpoint(%d:%d) INT IN needs %zu bw "
+                    "but only %zu is reserved.\n",
+                    target.address, target.endpoint, bw, res_bw);
                 return ENOENT;
         }
@@ -241 +251 @@
             target.address, target.endpoint, size, max_packet_size);
 
+        size_t res_bw;
         endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
-            target.address, target.endpoint, USB_DIRECTION_IN, NULL);
+            target.address, target.endpoint, USB_DIRECTION_IN, &res_bw);
         if (ep == NULL) {
                 usb_log_error("Endpoint(%d:%d) not registered for INT IN.\n",
-                        target.address, target.endpoint);
+                    target.address, target.endpoint);
                 return ENOENT;
         }
+        const size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
+            size, ep->max_packet_size);
+        if (res_bw < bw)
+        {
+                usb_log_error("Endpoint(%d:%d) INT IN needs %zu bw "
+                    "but only %zu bw is reserved.\n",
+                    target.address, target.endpoint, bw, res_bw);
+                return ENOENT;
+        }
+
         assert(ep->speed ==
             usb_device_keeper_get_speed(&hc->manager, target.address));