Changeset 9783496 in mainline

Timestamp:

2011-04-06T16:23:24Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

90b9ab5

Parents:

9262571

Message:

Remove arg argument

Location:

uspace/lib/usb

Files:

• include/usb/host/usb_endpoint_manager.h (modified) (1 diff)
• src/host/usb_endpoint_manager.c (modified) (3 diffs)

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

@@ -64 +64 @@
 int usb_endpoint_manager_register_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t ep, usb_direction_t direction,
-    void *data, void (*data_remove_callback)(void* data, void* arg), void *arg,
-    size_t bw);
+    void *data, void (*data_remove_callback)(void* data), size_t bw);
 
 int usb_endpoint_manager_register_ep_wait(usb_endpoint_manager_t *instance,

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

@@ -48 +48 @@
         size_t bw;
         void *data;
-        void (*data_remove_callback)(void* data, void* arg);
-        void *arg;
+        void (*data_remove_callback)(void* data);
 } ep_t;
 /*----------------------------------------------------------------------------*/
@@ -82 +81 @@
         ep_t *ep =
             hash_table_get_instance(item, ep_t, link);
-        ep->data_remove_callback(ep->data, ep->arg);
+        ep->data_remove_callback(ep->data);
         free(ep);
 }
@@ -147 +146 @@
 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, void* arg), void *arg,
-    size_t bw)
+    void *data, void (*data_remove_callback)(void* data), size_t bw)
 {
         assert(instance);