Changeset 1d10ca1 in mainline

Timestamp:

2011-05-25T19:07:20Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

5f9b81af

Parents:

1eee99f2

Message:

function for getting all report_ids renamed and fixed

Location:

uspace/lib/usbhid

Files:

• include/usb/hid/hidparser.h (modified) (1 diff)
• src/hidparser.c (modified) (4 diffs)

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

@@ -82 +82 @@
 
 /** */
-uint8_t usb_hid_report_get_report_id(usb_hid_report_t *report, 
+uint8_t usb_hid_report_get_next_report_id(usb_hid_report_t *report, 
                                      uint8_t report_id, 
                                      usb_hid_report_type_t type);

uspace/lib/usbhid/src/hidparser.c

@@ -560 +560 @@
 /*---------------------------------------------------------------------------*/
 /**
- * Returns nonzero (report_id) number if there is report of given type and
- * have the specified report_id in report structure
- *
- * @param report_id Searched report id
+ * Returns next report_id of report of specified type. If zero is given than
+ * first report_id of specified type is returned (0 is not legal value for
+ * repotr_id)
+ *
+ * @param report_id Current report_id, 0 if there is no current report_id
  * @param type Type of searched report
  * @param report Report structure inwhich we search
@@ -569 +570 @@
  * @retval report_id otherwise
  */
-uint8_t usb_hid_report_get_report_id(usb_hid_report_t *report, 
+uint8_t usb_hid_report_get_next_report_id(usb_hid_report_t *report, 
         uint8_t report_id, usb_hid_report_type_t type)
 {
@@ -579 +580 @@
         link_t *report_it;
         
-        if(report_id == 0) {
+        if(report_id > 0) {
                 report_it = usb_hid_report_find_description(report, report_id, 
                         type)->link.next;               
@@ -588 +589 @@
 
         while(report_it != &report->reports) {
-                report_des = list_get_instance(report_it, usb_hid_report_description_t,
-                        link);
+                report_des = list_get_instance(report_it, 
+                        usb_hid_report_description_t, link);
 
                 if(report_des->type == type){