Changeset 26e7d6d in mainline for uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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:

Merge mainline changes

File:

• uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h (modified) (5 diffs)

uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

@@ -38 +38 @@
  */
 #ifndef LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
-#define LIBUSBHOST_HOST_YSB_ENDPOINT_MANAGER_H
+#define LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
 
 #include <stdlib.h>
@@ -52 +52 @@
         hash_table_t ep_table;
         fibril_mutex_t guard;
-        fibril_condvar_t change;
         size_t free_bw;
+        size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
 } usb_endpoint_manager_t;
 
@@ -60 +60 @@
 
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth);
+    size_t available_bandwidth,
+    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t));
 
 void usb_endpoint_manager_destroy(usb_endpoint_manager_t *instance);
@@ -77 +78 @@
     usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data);
 
+/** Wrapper combining allocation and insertion */
 static inline int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
@@ -82 +84 @@
     size_t data_size)
 {
-        endpoint_t *ep = malloc(sizeof(endpoint_t));
-        if (ep == NULL)
+        endpoint_t *ep = endpoint_get(
+            address, endpoint, direction, type, speed, max_packet_size);
+        if (!ep)
                 return ENOMEM;
 
-        int ret = endpoint_init(ep, address, endpoint, direction, type, speed,
-            max_packet_size);
-        if (ret != EOK) {
-                free(ep);
-                return ret;
-        }
-
-        ret = usb_endpoint_manager_register_ep(instance, ep, data_size);
+        const int ret =
+            usb_endpoint_manager_register_ep(instance, ep, data_size);
         if (ret != EOK) {
                 endpoint_destroy(ep);
-                return ret;
         }
-        return EOK;
+        return ret;
 }
 #endif