Changeset cd83f25 in mainline for uspace/lib/usbhid/include/usb/hid/hiddescriptor.h

Timestamp:

2011-05-27T09:58:08Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e89bb50

Parents:

63d4d4fd (diff), 848dafc (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 usb/development

File:

• uspace/lib/usbhid/include/usb/hid/hiddescriptor.h (modified) (3 diffs)

uspace/lib/usbhid/include/usb/hid/hiddescriptor.h

@@ -43 +43 @@
 
 int usb_hid_parse_report_descriptor(usb_hid_report_t *report, 
-                                    const uint8_t *data, size_t size);
+                const uint8_t *data, size_t size);
 
 void usb_hid_free_report(usb_hid_report_t *report);
@@ -51 +51 @@
 int usb_hid_report_init(usb_hid_report_t *report);
 
-int usb_hid_report_append_fields(usb_hid_report_t *report, 
-                                 usb_hid_report_item_t *report_item);
+int usb_hid_report_append_fields(usb_hid_report_t *report,
+                usb_hid_report_item_t *report_item);
 
-usb_hid_report_description_t * usb_hid_report_find_description(const usb_hid_report_t *report, uint8_t report_id, usb_hid_report_type_t type);
+usb_hid_report_description_t * usb_hid_report_find_description(
+                const usb_hid_report_t *report, uint8_t report_id,
+                usb_hid_report_type_t type);
 
-int usb_hid_report_parse_tag(uint8_t tag, uint8_t class, const uint8_t *data, size_t item_size,
-                             usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path);
+int usb_hid_report_parse_tag(uint8_t tag, uint8_t class, const uint8_t *data,
+                size_t item_size, usb_hid_report_item_t *report_item,
+                usb_hid_report_path_t *usage_path);
 
-int usb_hid_report_parse_main_tag(uint8_t tag, const uint8_t *data, size_t item_size,
-                             usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path);
+int usb_hid_report_parse_main_tag(uint8_t tag, const uint8_t *data, 
+                size_t item_size, usb_hid_report_item_t *report_item,
+                usb_hid_report_path_t *usage_path);
 
-int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, size_t item_size,
-                             usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path);
+int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, 
+                size_t item_size, usb_hid_report_item_t *report_item,
+                usb_hid_report_path_t *usage_path);
 
-int usb_hid_report_parse_local_tag(uint8_t tag, const uint8_t *data, size_t item_size,
-                             usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path);
+int usb_hid_report_parse_local_tag(uint8_t tag, const uint8_t *data, 
+                size_t item_size, usb_hid_report_item_t *report_item,
+                usb_hid_report_path_t *usage_path);
 
 void usb_hid_descriptor_print_list(link_t *head);
@@ -74 +80 @@
 void usb_hid_free_report_list(link_t *head);
 
-usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item);
+usb_hid_report_item_t *usb_hid_report_item_clone(
+                const usb_hid_report_item_t *item);
 
 uint32_t usb_hid_report_tag_data_uint32(const uint8_t *data, size_t size);
 
-usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t *report, usb_hid_report_path_t *cmp_path);
+usb_hid_report_path_t *usb_hid_report_path_try_insert(usb_hid_report_t*report,
+                usb_hid_report_path_t *cmp_path);