Changeset 8dc762e0 in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-04-06T21:12:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f567bcf

Parents:

1e70157

Message:

Move endpoint_t to libusb

File:

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

uspace/drv/uhci-hcd/iface.c

@@ -36 +36 @@
 
 #include <usb/debug.h>
-
-#include "endpoint.h"
+#include <usb/host/endpoint.h>
+
 #include "iface.h"
 #include "hc.h"
@@ -159 +159 @@
         const usb_speed_t speed =
             usb_device_keeper_get_speed(&hc->manager, address);
-        const size_t size = max_packet_size;
+        const size_t size =
+            (transfer_type == USB_TRANSFER_INTERRUPT
+            || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?
+            max_packet_size : 0;
         int ret;
 
@@ -175 +178 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        const size_t bw =
-            (transfer_type == USB_TRANSFER_INTERRUPT
-            || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?
-            bandwidth_count_usb11(speed, transfer_type, size, max_packet_size) :
-            0;
-
         ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
-            address, endpoint, direction, ep, endpoint_destroy, bw);
+            address, endpoint, direction, ep, size);
         if (ret != EOK) {
                 endpoint_destroy(ep);
@@ -226 +223 @@
 
         size_t res_bw;
-        endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_OUT, &res_bw);
         if (ep == NULL) {
@@ -283 +280 @@
 
         size_t res_bw;
-        endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_IN, &res_bw);
         if (ep == NULL) {
@@ -340 +337 @@
             target.address, target.endpoint, size, max_packet_size);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_OUT, NULL);
         if (ep == NULL) {
@@ -387 +384 @@
             target.address, target.endpoint, size, max_packet_size);
 
-        endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_IN, NULL);
         if (ep == NULL) {
@@ -438 +435 @@
         usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
             speed, target.address, target.endpoint, size, max_packet_size);
-        endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_BOTH, NULL);
         if (ep == NULL) {
@@ -489 +486 @@
         usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
             speed, target.address, target.endpoint, size, max_packet_size);
-        endpoint_t *ep = usb_endpoint_manager_get_ep_data(&hc->ep_manager,
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
             target.address, target.endpoint, USB_DIRECTION_BOTH, NULL);
         if (ep == NULL) {