Changeset f29931c in mainline

Timestamp:

2012-12-16T14:53:34Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4daee7a

Parents:

2f87aa6

Message:

libusbhost: Use function typedefs.

Location:

uspace/lib/usbhost

Files:

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

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

@@ -46 +46 @@
 typedef struct hcd hcd_t;
 
+typedef int (*schedule_hook_t)(hcd_t *, usb_transfer_batch_t *);
+typedef int (*ep_add_hook_t)(hcd_t *, endpoint_t *);
+typedef void (*ep_remove_hook_t)(hcd_t *, endpoint_t *);
+
 /** Generic host controller driver structure. */
 struct hcd {
@@ -56 +60 @@
         void *private_data;
         /** Transfer scheduling, implement in device driver. */
-        int (*schedule)(hcd_t *, usb_transfer_batch_t *);
+        schedule_hook_t schedule;
         /** Hook called upon registering new endpoint. */
-        int (*ep_add_hook)(hcd_t *, endpoint_t *);
+        ep_add_hook_t ep_add_hook;
         /** Hook called upon removing of an endpoint. */
-        void (*ep_remove_hook)(hcd_t *, endpoint_t *);
+        ep_remove_hook_t ep_remove_hook;
 };
 

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

@@ -53 +53 @@
 #define ENDPOINT_LIST_COUNT 8
 
+typedef size_t (*bw_count_func_t)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
+typedef void (*ep_remove_callback_t)(endpoint_t *, void *);
+typedef int (*ep_add_callback_t)(endpoint_t *, void *);
+
 /** Endpoint management structure */
 typedef struct usb_endpoint_manager {
@@ -62 +66 @@
         size_t free_bw;
         /** Use this function to count bw required by EP */
-        size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
+        bw_count_func_t bw_count;
 } usb_endpoint_manager_t;
+
 
 size_t bandwidth_count_usb11(usb_speed_t speed, usb_transfer_type_t type,
@@ -69 +74 @@
 
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth,
-    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t));
+    size_t available_bandwidth, bw_count_func_t bw_count);
 
 void usb_endpoint_manager_reset_eps_if_need(usb_endpoint_manager_t *instance,
@@ -85 +89 @@
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size,
-    size_t data_size, int (*callback)(endpoint_t *, void *), void *arg);
+    size_t data_size, ep_add_callback_t callback, void *arg);
 
 int usb_endpoint_manager_remove_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
-    void (*callback)(endpoint_t *, void *), void *arg);
+    ep_remove_callback_t callback, void *arg);
 
 void usb_endpoint_manager_remove_address(usb_endpoint_manager_t *instance,
-    usb_address_t address, void (*callback)(endpoint_t *, void *), void *arg);
+    usb_address_t address, ep_remove_callback_t callback, void *arg);
 #endif
 /**

uspace/lib/usbhost/src/usb_endpoint_manager.c

@@ -318 +318 @@
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size,
-    size_t data_size, int (*callback)(endpoint_t *, void *), void *arg)
+    size_t data_size, ep_add_callback_t callback, void *arg)
 {
         assert(instance);