Changeset 3f03199 in mainline for uspace/lib/usbhid

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Location:

uspace/lib/usbhid/src

Files:

• hiddescriptor.c (modified) (5 diffs)
• hidparser.c (modified) (10 diffs)
• hidpath.c (modified) (5 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -333 +333 @@
         }
 
-        usb_hid_report_description_t *report_des = NULL;
-        
-        list_foreach(report->reports, report_it) {
-                report_des = list_get_instance(report_it,
-                                usb_hid_report_description_t, reports_link);
-
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, report_des) {
                 // if report id not set, return the first of the type
                 if(((report_des->report_id == report_id) || (report_id == 0)) && 
@@ -902 +898 @@
 void usb_hid_descriptor_print_list(list_t *list)
 {
-        usb_hid_report_field_t *report_item;
-
         if(list == NULL || list_empty(list)) {
             usb_log_debug("\tempty\n");
@@ -909 +903 @@
         }
 
-        list_foreach(*list, item) {
-                report_item = list_get_instance(item, usb_hid_report_field_t,
-                                ritems_link);
-
+        list_foreach(*list, ritems_link, usb_hid_report_field_t,
+            report_item) {
                 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
                 usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
@@ -937 +929 @@
 
                 usb_log_debug("\n");
-
-        }
-
+        }
 }
 
@@ -951 +941 @@
 void usb_hid_descriptor_print(usb_hid_report_t *report)
 {
-        if(report == NULL) {
+        if (report == NULL)
                 return;
-        }
-
-        usb_hid_report_description_t *report_des;
-
-        list_foreach(report->reports, report_it) {
-                report_des = list_get_instance(report_it,
-                        usb_hid_report_description_t, reports_link);
+
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, report_des) {
                 usb_log_debug("Report ID: %d\n", report_des->report_id);
                 usb_log_debug("\tType: %d\n", report_des->type);

uspace/lib/usbhid/src/hidparser.c

@@ -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;
@@ -153 +151 @@
 
         /* read data */
-        list_foreach(report_des->report_items, list_item) {
-                item = list_get_instance(list_item, usb_hid_report_field_t, 
-                    ritems_link);
+        list_foreach(report_des->report_items, ritems_link,
+            usb_hid_report_field_t, item) {
 
                 if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
@@ -163 +160 @@
                                 item->value = 
                                         usb_hid_translate_data(item, data);
-                
+                                
                                 item->usage = USB_HID_EXTENDED_USAGE(
                                     item->usages[item->value -
@@ -184 +181 @@
                                 /* variable item */
                                 item->value = usb_hid_translate_data(item, 
-                                    data);                              
-                        }                       
+                                    data);
+                        }
                 }
         }
@@ -295 +292 @@
         usb_hid_report_description_t *report_des = NULL;
 
-        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)) {
+        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;
                         break;
                 }
@@ -351 +347 @@
 
         if (report->use_report_ids != 0) {
-                buffer[0] = report_id;          
+                buffer[0] = report_id;
         }
 
@@ -362 +358 @@
         }
 
-        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);
-
+        list_foreach(report_des->report_items, ritems_link,
+            usb_hid_report_field_t, report_item) {
                 value = usb_hid_translate_data_reverse(report_item, 
                     report_item->value);
@@ -382 +374 @@
                         }
                         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);
@@ -400 +392 @@
 
                                         tmp_value = tmp_value << (offset % 8);
-        
+                                        
                                         mask = ~(((1 << (8 - (offset % 8))) - 1)
                                             << (offset % 8));
@@ -413 +405 @@
                                         value = value & ((1 << (length - 
                                             ((offset + length) % 8))) - 1);
-                                
+                                        
                                         mask = (1 << (length - 
                                             ((offset + length) % 8))) - 1;

uspace/lib/usbhid/src/hidpath.c

@@ -176 +176 @@
         usb_log_debug("\tLENGTH: %d\n", path->depth);
 
-        usb_hid_report_usage_path_t *path_item;
-
-        list_foreach(path->items, item) {
-                path_item = list_get_instance(item, usb_hid_report_usage_path_t,
-                        rpath_items_link);
+        list_foreach(path->items, rpath_items_link,
+            usb_hid_report_usage_path_t, path_item) {
 
                 usb_log_debug("\tUSAGE_PAGE: %X\n", path_item->usage_page);
@@ -237 +234 @@
                         usb_hid_report_usage_path_t, rpath_items_link);
 
-                list_foreach(report_path->items, report_link) {
-                        report_item = list_get_instance(report_link,
-                                usb_hid_report_usage_path_t, rpath_items_link);
+                list_foreach(report_path->items, rpath_items_link,
+                    usb_hid_report_usage_path_t, report_item) {
+
+                        if (USB_HID_SAME_USAGE_PAGE(report_item->usage_page,
+                                path_item->usage_page)) {
                                 
-                        if(USB_HID_SAME_USAGE_PAGE(report_item->usage_page,
-                                path_item->usage_page)){
-                                        
-                                if(only_page == 0){
-                                        if(USB_HID_SAME_USAGE(
-                                                report_item->usage,
-                                                path_item->usage)) {
-                                                        
+                                if (only_page == 0) {
+                                        if (USB_HID_SAME_USAGE(report_item->usage,
+                                            path_item->usage))
                                                 return EOK;
-                                        }
                                 }
                                 else {
@@ -266 +259 @@
                         return 1;
                 }
-                
+
         /* path is prefix of the report_path */
         case USB_HID_PATH_COMPARE_BEGIN:
-        
+
                 report_link = report_path->items.head.next;
                 path_link = path->items.head.next;
+                
+                while ((report_link != &report_path->items.head) &&
+                    (path_link != &path->items.head)) {
                         
-                while((report_link != &report_path->items.head) && 
-                      (path_link != &path->items.head)) {
-                                          
                         report_item = list_get_instance(report_link, 
-                                usb_hid_report_usage_path_t, rpath_items_link);
-                                          
+                            usb_hid_report_usage_path_t, rpath_items_link);
+                        
                         path_item = list_get_instance(path_link,
                                 usb_hid_report_usage_path_t, rpath_items_link);
 
-                        if(!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 
-                                path_item->usage_page) || ((only_page == 0) && 
+                        if (!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, 
+                            path_item->usage_page) || ((only_page == 0) && 
                             !USB_HID_SAME_USAGE(report_item->usage, 
-                                path_item->usage))) {
-                        
+                            path_item->usage))) {
                                 return 1;
-                        } 
-                        else {
+                        } else {
                                 report_link = report_link->next;
-                                path_link = path_link->next;                    
+                                path_link = path_link->next;
                         }
-                        
-                }
-
-                if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 
-                        (path_link == &path->items.head)) || 
-                   ((report_link == &report_path->items.head) && 
-                        (path_link == &path->items.head))) {
-                                
+                }
+
+                if ((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && 
+                    (path_link == &path->items.head)) || 
+                    ((report_link == &report_path->items.head) && 
+                    (path_link == &path->items.head))) {
                         return EOK;
-                }
-                else {
+                } else {
                         return 1;
-                }                                               
+                }
                 break;
 
@@ -405 +393 @@
         usb_hid_report_path_t *usage_path)
 {
-        usb_hid_report_usage_path_t *path_item;
         usb_hid_report_usage_path_t *new_path_item;
         usb_hid_report_path_t *new_usage_path = usb_hid_report_path ();
@@ -419 +406 @@
         }
 
-        list_foreach(usage_path->items, path_link) {
-                path_item = list_get_instance(path_link,
-                        usb_hid_report_usage_path_t, rpath_items_link);
+        list_foreach(usage_path->items, rpath_items_link,
+            usb_hid_report_usage_path_t, path_item) {
 
                 new_path_item = malloc(sizeof(usb_hid_report_usage_path_t));