Changes in uspace/lib/usbhid/src/hidparser.c [1e371cf:9d58539] in mainline

File:

• uspace/lib/usbhid/src/hidparser.c (modified) (21 diffs)

uspace/lib/usbhid/src/hidparser.c

@@ -41 +41 @@
 #include <assert.h>
 
-
+/*---------------------------------------------------------------------------*/
 /*
  * Data translation private functions
@@ -52 +52 @@
         int32_t value);
 
-
+/*---------------------------------------------------------------------------*/
 
 static int usb_pow(int a, int b)
@@ -68 +68 @@
         }
 }
-
+/*---------------------------------------------------------------------------*/
 
 /** Returns size of report of specified report id and type in items
@@ -117 +117 @@
         }
 }
-
+/*---------------------------------------------------------------------------*/
 
 /** Parse and act upon a HID report.
@@ -130 +130 @@
     size_t size, uint8_t *report_id)
 {
+        usb_hid_report_field_t *item;
+
         usb_hid_report_description_t *report_des;
         usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT;
@@ -151 +153 @@
 
         /* read data */
-        list_foreach(report_des->report_items, ritems_link,
-            usb_hid_report_field_t, item) {
+        list_foreach(report_des->report_items, list_item) {
+                item = list_get_instance(list_item, usb_hid_report_field_t, 
+                    ritems_link);
 
                 if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
@@ -160 +163 @@
                                 item->value = 
                                         usb_hid_translate_data(item, data);
-                                
+                
                                 item->usage = USB_HID_EXTENDED_USAGE(
                                     item->usages[item->value -
@@ -181 +184 @@
                                 /* variable item */
                                 item->value = usb_hid_translate_data(item, 
-                                    data);
-                        }
+                                    data);                              
+                        }                       
                 }
         }
@@ -189 +192 @@
 }
 
-
+/*---------------------------------------------------------------------------*/
 /**
  * Translate data from the report as specified in report descriptor item
@@ -271 +274 @@
 }
 
-
+/*---------------------------------------------------------------------------*/
 /* OUTPUT API */
 
@@ -292 +295 @@
         usb_hid_report_description_t *report_des = NULL;
 
-        list_foreach(report->reports, reports_link,
-            usb_hid_report_description_t, rdes) {
-                if ((rdes->report_id == report_id) &&
-                    (rdes->type == USB_HID_REPORT_TYPE_OUTPUT)) {
-                        report_des = rdes;
+        list_foreach(report->reports, report_it) {
+                report_des = list_get_instance(report_it,
+                    usb_hid_report_description_t, reports_link);
+                
+                if ((report_des->report_id == report_id) &&
+                    (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)) {
                         break;
                 }
@@ -347 +351 @@
 
         if (report->use_report_ids != 0) {
-                buffer[0] = report_id;
+                buffer[0] = report_id;          
         }
 
@@ -358 +362 @@
         }
 
-        list_foreach(report_des->report_items, ritems_link,
-            usb_hid_report_field_t, report_item) {
+        usb_hid_report_field_t *report_item;
+
+        list_foreach(report_des->report_items, item) {
+                report_item = list_get_instance(item, usb_hid_report_field_t,
+                    ritems_link);
+
                 value = usb_hid_translate_data_reverse(report_item, 
                     report_item->value);
@@ -374 +382 @@
                         }
                         size_t shift = 8 - offset % 8 - length;
-                        value = value << shift;
+                        value = value << shift;                                                 
                         value = value & (((1 << length) - 1) << shift);
-                        
+                                
                         uint8_t mask = 0;
                         mask = 0xff - (((1 << length) - 1) << shift);
@@ -392 +400 @@
 
                                         tmp_value = tmp_value << (offset % 8);
-                                        
+        
                                         mask = ~(((1 << (8 - (offset % 8))) - 1)
                                             << (offset % 8));
@@ -405 +413 @@
                                         value = value & ((1 << (length - 
                                             ((offset + length) % 8))) - 1);
-                                        
+                                
                                         mask = (1 << (length - 
                                             ((offset + length) % 8))) - 1;
@@ -423 +431 @@
 }
 
-
+/*---------------------------------------------------------------------------*/
 /**
  * Translate given data for putting them into the outoput report
@@ -468 +476 @@
 }
 
-
+/*---------------------------------------------------------------------------*/
 /**
  * Clones given state table
@@ -489 +497 @@
 }
 
-
+/*---------------------------------------------------------------------------*/
 /**
  * Function for sequence walking through the report. Returns next field in the
@@ -544 +552 @@
 }
 
-
+/*---------------------------------------------------------------------------*/
 /**
  * Returns next report_id of report of specified type. If zero is given than
@@ -592 +600 @@
 }
 
-
+/*---------------------------------------------------------------------------*/
 /**
  * Reset all local items in given state table