Changeset dcaf819 in mainline for uspace/drv/ohci

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (1 diff)
• hc.c (modified) (1 diff)
• hc.h (modified) (2 diffs)
• hw_struct/endpoint_descriptor.h (added)
• hw_struct/iso_transfer_descriptor.h (added)
• hw_struct/transfer_descriptor.h (added)
• iface.c (modified) (2 diffs)

uspace/drv/ohci/batch.c

@@ -73 +73 @@
         CHECK_NULL_DISPOSE_RETURN(instance,
             "Failed to allocate batch instance.\n");
-        usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
-            buffer, NULL, buffer_size, NULL, setup_size, func_in,
-            func_out, arg, fun, NULL);
+        usb_transfer_batch_init(instance, target, transfer_type, speed,
+            max_packet_size, buffer, NULL, buffer_size, NULL, setup_size,
+            func_in, func_out, arg, fun, NULL, NULL);
 
         if (buffer_size > 0) {

uspace/drv/ohci/hc.c

@@ -92 +92 @@
         instance->ddf_instance = fun;
         usb_device_keeper_init(&instance->manager);
-        ret = bandwidth_init(&instance->bandwidth, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
-        CHECK_RET_RETURN(ret, "Failed to initialize bandwidth allocator: %s.\n",
+        ret = usb_endpoint_manager_init(&instance->ep_manager,
+            BANDWIDTH_AVAILABLE_USB11);
+        CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
             ret, str_error(ret));
 

uspace/drv/ohci/hc.h

@@ -42 +42 @@
 #include <usb/usb.h>
 #include <usb/host/device_keeper.h>
-#include <usb/host/bandwidth.h>
+#include <usb/host/usb_endpoint_manager.h>
 #include <usbhc_iface.h>
 
@@ -55 +55 @@
         ddf_fun_t *ddf_instance;
         usb_device_keeper_t manager;
-        bandwidth_t bandwidth;
+        usb_endpoint_manager_t ep_manager;
         fid_t interrupt_emulator;
 } hc_t;

uspace/drv/ohci/iface.c

@@ -162 +162 @@
             address, endpoint, usb_str_transfer_type(transfer_type),
             usb_str_speed(speed), direction, size, max_packet_size, interval);
-        return bandwidth_reserve(&hc->bandwidth, address, endpoint, direction,
-            speed, transfer_type, max_packet_size, size, interval);
+        // TODO use real endpoint here!
+        return usb_endpoint_manager_register_ep(&hc->ep_manager,
+            address, endpoint, direction, NULL, 0);
 }
 /*----------------------------------------------------------------------------*/
@@ -183 +184 @@
         usb_log_debug("Unregister endpoint %d:%d %d.\n",
             address, endpoint, direction);
-        return bandwidth_release(&hc->bandwidth, address, endpoint, direction);
-
-        return ENOTSUP;
+        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
+            endpoint, direction);
 }
 /*----------------------------------------------------------------------------*/