Changeset f1fae414 in mainline for uspace/lib/usbhid/src/hidparser.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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 mainline changes.

File:

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

uspace/lib/usbhid/src/hidparser.c

@@ -135 +135 @@
         size_t size, uint8_t *report_id)
 {
-        link_t *list_item;
         usb_hid_report_field_t *item;
 
@@ -161 +160 @@
 
         /* read data */
-        list_item = report_des->report_items.next;         
-        while(list_item != &(report_des->report_items)) {
-
+        list_foreach(report_des->report_items, list_item) {
                 item = list_get_instance(list_item, usb_hid_report_field_t, 
-                                link);
+                                ritems_link);
 
                 if(USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
@@ -200 +197 @@
                         }                       
                 }
-                list_item = list_item->next;
         }
         
@@ -310 +306 @@
         }
 
-        link_t *report_it = report->reports.next;
         usb_hid_report_description_t *report_des = NULL;
-        while(report_it != &report->reports) {
-                report_des = list_get_instance(report_it, 
-                        usb_hid_report_description_t, link);
+
+        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) && 
+                if((report_des->report_id == report_id) &&
                         (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)){
                         break;
                 }
-
-                report_it = report_it->next;
         }
 
@@ -362 +356 @@
         uint8_t report_id, uint8_t *buffer, size_t size)
 {
-        link_t *item;   
         int32_t value=0;
         int offset;
@@ -384 +377 @@
         }
 
-        usb_hid_report_field_t *report_item;    
-        item = report_des->report_items.next;   
-        while(item != &report_des->report_items) {
-                report_item = list_get_instance(item, usb_hid_report_field_t, link);
+        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, 
@@ -449 +443 @@
                 // reset value
                 report_item->value = 0;
-                
-                item = item->next;
         }
         
@@ -550 +542 @@
 
         if(field == NULL){
-                field_it = report_des->report_items.next;
-        }
-        else {
-                field_it = field->link.next;
-        }
-
-        while(field_it != &report_des->report_items) {
+                field_it = report_des->report_items.head.next;
+        }
+        else {
+                field_it = field->ritems_link.next;
+        }
+
+        while(field_it != &report_des->report_items.head) {
                 field = list_get_instance(field_it, usb_hid_report_field_t, 
-                        link);
+                        ritems_link);
 
                 if(USB_HID_ITEM_FLAG_CONSTANT(field->item_flags) == 0) {
@@ -611 +603 @@
                 }
                 else {
-                        report_it = report_des->link.next;
+                        report_it = report_des->reports_link.next;
                 }       
         }
         else {
-                report_it = report->reports.next;
-        }
-
-        while(report_it != &report->reports) {
+                report_it = report->reports.head.next;
+        }
+
+        while(report_it != &report->reports.head) {
                 report_des = list_get_instance(report_it, 
-                        usb_hid_report_description_t, link);
+                        usb_hid_report_description_t, reports_link);
 
                 if(report_des->type == type){