Changeset f126c87 in mainline for uspace/lib/usbhost/include/usb/host/hcd.h

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

• uspace/lib/usbhost/include/usb/host/hcd.h (modified) (3 diffs)

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

@@ -81 +81 @@
 };
 
-void hcd_init(hcd_t *hcd, usb_speed_t max_speed, size_t bandwidth,
-    bw_count_func_t bw_count);
+extern void hcd_init(hcd_t *, usb_speed_t, size_t, bw_count_func_t);
 
 static inline void hcd_set_implementation(hcd_t *hcd, void *data,
@@ -102 +101 @@
 }
 
-usb_address_t hcd_request_address(hcd_t *hcd, usb_speed_t speed);
+extern usb_address_t hcd_request_address(hcd_t *, usb_speed_t);
 
-int hcd_release_address(hcd_t *hcd, usb_address_t address);
+extern int hcd_release_address(hcd_t *, usb_address_t);
 
-int hcd_reserve_default_address(hcd_t *hcd, usb_speed_t speed);
+extern int hcd_reserve_default_address(hcd_t *, usb_speed_t);
 
 static inline int hcd_release_default_address(hcd_t *hcd)
@@ -113 +112 @@
 }
 
-int hcd_add_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir,
-    usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
-    size_t size, usb_address_t tt_address, unsigned tt_port);
+extern int hcd_add_ep(hcd_t *, usb_target_t, usb_direction_t,
+    usb_transfer_type_t, size_t, unsigned int, size_t, usb_address_t,
+    unsigned int);
 
-int hcd_remove_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir);
+extern int hcd_remove_ep(hcd_t *, usb_target_t, usb_direction_t);
 
-int hcd_send_batch(hcd_t *hcd, usb_target_t target, usb_direction_t direction,
-    void *data, size_t size, uint64_t setup_data,
-    usbhc_iface_transfer_in_callback_t in,
-    usbhc_iface_transfer_out_callback_t out, void *arg, const char* name);
+extern int hcd_send_batch(hcd_t *, usb_target_t, usb_direction_t, void *,
+    size_t, uint64_t, usbhc_iface_transfer_in_callback_t,
+    usbhc_iface_transfer_out_callback_t, void *, const char *);
 
-ssize_t hcd_send_batch_sync(hcd_t *hcd, usb_target_t target,
-    usb_direction_t dir, void *data, size_t size, uint64_t setup_data,
-    const char* name);
+extern ssize_t hcd_send_batch_sync(hcd_t *, usb_target_t, usb_direction_t,
+    void *, size_t, uint64_t, const char *);
 
 #endif
+
 /**
  * @}