Changeset dcaf819 in mainline for uspace/drv/uhci-hcd/hc.c

Timestamp:

2011-04-06T22:33:08Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9a7e5b4

Parents:

6bf9bc4 (diff), 87305bb (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:

OHCI structures, bandwidth reworked

Initial support for endpoint registration and a new way of bandwidth reservation
New usb_endpoint_manager to manage endpoints, bandwidth, and toggle states.
Further work:

switch communication collision avoidance to the new endpoint manager (requires registration of all endpoints)

use endpoint registration in default address reservation

File:

• uspace/drv/uhci-hcd/hc.c (modified) (7 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -66 +66 @@
 static int hc_interrupt_emulator(void *arg);
 static int hc_debug_checker(void *arg);
-
+#if 0
 static bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size);
+#endif
 /*----------------------------------------------------------------------------*/
 /** Initialize UHCI hcd driver structure
@@ -239 +240 @@
         usb_log_debug("Initialized device manager.\n");
 
-        ret = bandwidth_init(&instance->bandwidth, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
+        ret =
+            usb_endpoint_manager_init(&instance->ep_manager,
+                BANDWIDTH_AVAILABLE_USB11);
         assert(ret == EOK);
 
@@ -326 +328 @@
         assert(instance);
         assert(batch);
-        const int low_speed = (batch->speed == USB_SPEED_LOW);
-        if (!usb_is_allowed(
-            low_speed, batch->transfer_type, batch->max_packet_size)) {
-                usb_log_error("Invalid USB transfer specified %s %d %zu.\n",
-                    usb_str_speed(batch->speed), batch->transfer_type,
-                    batch->max_packet_size);
-                return ENOTSUP;
-        }
-        /* Check available bandwidth */
-        if (batch->transfer_type == USB_TRANSFER_INTERRUPT ||
-            batch->transfer_type == USB_TRANSFER_ISOCHRONOUS) {
-                size_t bw = bandwidth_count_usb11(batch->speed,
-                    batch->transfer_type, batch->buffer_size,
-                    batch->max_packet_size);
-                int ret =
-                    bandwidth_use(&instance->bandwidth, batch->target.address,
-                    batch->target.endpoint, batch->direction, bw);
-                if (ret != EOK) {
-                        usb_log_error("Failed(%d) to use reserved bw: %s.\n",
-                            ret, str_error(ret));
-                        return ret;
-                }
-        }
 
         transfer_list_t *list =
@@ -402 +381 @@
                         case USB_TRANSFER_INTERRUPT:
                         case USB_TRANSFER_ISOCHRONOUS: {
+/*
                                 int ret = bandwidth_free(&instance->bandwidth,
                                     batch->target.address,
@@ -410 +390 @@
                                             "reserved bw: %s.\n", ret,
                                             str_error(ret));
+*/
                                 }
                         default:
@@ -533 +514 @@
  * @return True if transaction is allowed by USB specs, false otherwise
  */
+#if 0
 bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size)
@@ -550 +532 @@
         return false;
 }
+#endif
 /**
  * @}