Changeset 8dc762e0 in mainline for uspace/lib/usb/src

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

Location:

uspace/lib/usb/src/host

Files:

• device_keeper.c (modified) (1 diff)
• endpoint.c (moved) (moved from uspace/drv/uhci-hcd/endpoint.c ) (2 diffs)
• usb_endpoint_manager.c (modified) (8 diffs)

uspace/lib/usb/src/host/device_keeper.c

@@ -63 +63 @@
 /*----------------------------------------------------------------------------*/
 void usb_device_keeper_add_ep(
-    usb_device_keeper_t *instance, usb_address_t address, link_t *ep);
+    usb_device_keeper_t *instance, usb_address_t address, link_t *ep)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        assert(instance->devices[address].occupied);
+        list_append(ep, &instance->devices[address].endpoints);
+        fibril_mutex_unlock(&instance->guard);
+}
 /*----------------------------------------------------------------------------*/
 /** Attempt to obtain address 0, blocks.

uspace/lib/usb/src/host/endpoint.c

@@ -36 +36 @@
 #include <errno.h>
 
-#include "endpoint.h"
-#include "utils/malloc32.h"
+#include <usb/host/endpoint.h>
 
 int endpoint_init(endpoint_t *instance, usb_transfer_type_t transfer_type,
@@ -48 +47 @@
         instance->max_packet_size = max_packet_size;
         instance->toggle = 0;
-        instance->qh = malloc32(sizeof(qh_t));
-        if (instance->qh == NULL)
-                return ENOMEM;
         return EOK;
 }
 /*----------------------------------------------------------------------------*/
-void endpoint_destroy(void *ep)
+void endpoint_destroy(endpoint_t *instance)
 {
-        endpoint_t *instance = ep;
         assert(instance);
         list_remove(&instance->same_device_eps);
-        free32(instance->qh);
         free(instance);
 }

uspace/lib/usb/src/host/usb_endpoint_manager.c

@@ -48 +48 @@
         link_t link;
         size_t bw;
-        void *data;
-        void (*data_remove_callback)(void* data);
-} ep_t;
-/*----------------------------------------------------------------------------*/
-static hash_index_t ep_hash(unsigned long key[])
+        endpoint_t *ep;
+} node_t;
+/*----------------------------------------------------------------------------*/
+static hash_index_t node_hash(unsigned long key[])
 {
         hash_index_t hash = 0;
@@ -63 +62 @@
 }
 /*----------------------------------------------------------------------------*/
-static int ep_compare(unsigned long key[], hash_count_t keys, link_t *item)
+static int node_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
         assert(item);
-        ep_t *ep = hash_table_get_instance(item, ep_t, link);
+        node_t *node = hash_table_get_instance(item, node_t, link);
         hash_count_t i = 0;
         for (; i < keys; ++i) {
-                if (key[i] != ep->key[i])
+                if (key[i] != node->key[i])
                         return false;
         }
@@ -75 +74 @@
 }
 /*----------------------------------------------------------------------------*/
-static void ep_remove(link_t *item)
+static void node_remove(link_t *item)
 {
         assert(item);
-        ep_t *ep =
-            hash_table_get_instance(item, ep_t, link);
-        ep->data_remove_callback(ep->data);
-        free(ep);
+        node_t *node = hash_table_get_instance(item, node_t, link);
+        endpoint_destroy(node->ep);
+        free(node);
 }
 /*----------------------------------------------------------------------------*/
 static hash_table_operations_t op = {
-        .hash = ep_hash,
-        .compare = ep_compare,
-        .remove_callback = ep_remove,
+        .hash = node_hash,
+        .compare = node_compare,
+        .remove_callback = node_remove,
 };
 /*----------------------------------------------------------------------------*/
@@ -145 +143 @@
 int usb_endpoint_manager_register_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
-    void *data, void (*data_remove_callback)(void* data), size_t bw)
-{
+    endpoint_t *ep, size_t data_size)
+{
+        assert(ep);
+        size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
+            data_size, ep->max_packet_size);
         assert(instance);
 
@@ -168 +169 @@
         }
 
-        ep_t *ep = malloc(sizeof(ep_t));
-        if (ep == NULL) {
+        node_t *node = malloc(sizeof(node_t));
+        if (node == NULL) {
                 fibril_mutex_unlock(&instance->guard);
                 return ENOMEM;
         }
 
-        ep->id = id;
-        ep->bw = bw;
-        ep->data = data;
-        link_initialize(&ep->link);
-
-        hash_table_insert(&instance->ep_table, (unsigned long*)&id, &ep->link);
+        node->id = id;
+        node->bw = bw;
+        node->ep = ep;
+        link_initialize(&node->link);
+
+        hash_table_insert(&instance->ep_table,
+            (unsigned long*)&id, &node->link);
         instance->free_bw -= bw;
         fibril_mutex_unlock(&instance->guard);
@@ -203 +205 @@
         }
 
-        ep_t *ep = hash_table_get_instance(item, ep_t, link);
-        instance->free_bw += ep->bw;
+        node_t *node = hash_table_get_instance(item, node_t, link);
+        instance->free_bw += node->bw;
         hash_table_remove(&instance->ep_table, (unsigned long*)&id, MAX_KEYS);
 
@@ -212 +214 @@
 }
 /*----------------------------------------------------------------------------*/
-void * usb_endpoint_manager_get_ep_data(usb_endpoint_manager_t *instance,
+endpoint_t * usb_endpoint_manager_get_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     size_t *bw)
@@ -229 +231 @@
                 return NULL;
         }
-        ep_t *ep = hash_table_get_instance(item, ep_t, link);
+        node_t *node = hash_table_get_instance(item, node_t, link);
         if (bw)
-                *bw = ep->bw;
+                *bw = node->bw;
 
         fibril_mutex_unlock(&instance->guard);
-        return ep->data;
-}
+        return node->ep;
+}