Changeset 5876d36 in mainline

Timestamp:

2011-04-06T18:36:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

88dd355

Parents:

391d55b

Message:

OHCI uses usb_endpoint_manager

removed old bandwidth_t

Location:

uspace

Files:

• drv/ohci/hc.c (modified) (1 diff)
• drv/ohci/hc.h (modified) (2 diffs)
• drv/ohci/iface.c (modified) (2 diffs)
• lib/usb/Makefile (modified) (1 diff)
• lib/usb/include/usb/host/bandwidth.h (deleted)
• lib/usb/src/host/bandwidth.c (deleted)

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, 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);
 }
 /*----------------------------------------------------------------------------*/

uspace/lib/usb/Makefile

@@ -54 +54 @@
         src/host/device_keeper.c \
         src/host/batch.c \
-        src/host/bandwidth.c \
         src/host/usb_endpoint_manager.c