Changeset f959a20f in mainline for uspace/lib/usbhid

Timestamp:

2019-02-01T22:32:38Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

00b7fc8

Parents:

1a37496

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 21:22:39)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 22:32:38)

Message:

Avoid directly using .head/.next/.prev of list_t/link_t

Use existing constructs from <adt/list.h> instead.

Location:

uspace/lib/usbhid/src

Files:

• hiddescriptor.c (modified) (3 diffs)
• hidparser.c (modified) (4 diffs)
• hidpath.c (modified) (5 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -89 +89 @@
     usb_hid_report_path_t *cmp_path)
 {
-        link_t *path_it = report->collection_paths.head.next;
-        usb_hid_report_path_t *path = NULL;
-
-        if ((report == NULL) || (cmp_path == NULL)) {
+        if (report == NULL || cmp_path == NULL)
                 return NULL;
-        }
-
-        while (path_it != &report->collection_paths.head) {
-                path = list_get_instance(path_it, usb_hid_report_path_t,
-                    cpath_link);
-
+
+        list_foreach(report->collection_paths, cpath_link, usb_hid_report_path_t, path) {
                 if (usb_hid_report_compare_usage_path(path, cmp_path,
-                    USB_HID_PATH_COMPARE_STRICT) == 0) {
-                        break;
-                }
-                path_it = path_it->next;
-        }
-        if (path_it == &report->collection_paths.head) {
-                path = usb_hid_report_path_clone(cmp_path);
-                if (path == NULL) {
-                        return NULL;
-                }
-                list_append(&path->cpath_link, &report->collection_paths);
-                report->collection_paths_count++;
-
-                return path;
-        } else {
-                return list_get_instance(path_it, usb_hid_report_path_t,
-                    cpath_link);
-        }
+                    USB_HID_PATH_COMPARE_STRICT) == 0)
+                        return path;
+        }
+
+        usb_hid_report_path_t *path = usb_hid_report_path_clone(cmp_path);
+        if (path == NULL)
+                return NULL;
+
+        list_append(&path->cpath_link, &report->collection_paths);
+        report->collection_paths_count++;
+
+        return path;
 }
 
@@ -474 +461 @@
                                     usb_hid_report_item_t, link);
 
+                                link_t *tmp_link = list_prev(
+                                    &report_item->usage_path->cpath_link,
+                                    &report->collection_paths);
+                                assert(tmp_link);
+
                                 usb_hid_report_usage_path_t *tmp_usage_path;
-                                tmp_usage_path = list_get_instance(
-                                    report_item->usage_path->cpath_link.prev,
+                                tmp_usage_path = list_get_instance(tmp_link,
                                     usb_hid_report_usage_path_t, rpath_items_link);
 
@@ -486 +477 @@
 
                                 usb_hid_report_path_free(report_item->usage_path);
-                                list_remove (item_link);
+                                list_remove(item_link);
 
                                 break;

uspace/lib/usbhid/src/hidparser.c

@@ -493 +493 @@
 
         if (field == NULL) {
-                field_it = report_des->report_items.head.next;
-        } else {
-                field_it = field->ritems_link.next;
-        }
-
-        while (field_it != &report_des->report_items.head) {
+                field_it = list_first(&report_des->report_items);
+        } else {
+                field_it = list_next(&field->ritems_link, &report_des->report_items);
+        }
+
+        while (field_it != NULL) {
                 field = list_get_instance(field_it, usb_hid_report_field_t,
                     ritems_link);
@@ -514 +514 @@
                         usb_hid_report_remove_last_item(field->collection_path);
                 }
-                field_it = field_it->next;
+                field_it = list_next(field_it, &report_des->report_items);
         }
 
@@ -547 +547 @@
                         return 0;
                 } else {
-                        report_it = report_des->reports_link.next;
+                        report_it = list_next(&report_des->reports_link,
+                            &report->reports);
                 }
         } else {
-                report_it = report->reports.head.next;
-        }
-
-        while (report_it != &report->reports.head) {
+                report_it = list_first(&report->reports);
+        }
+
+        while (report_it != NULL) {
                 report_des = list_get_instance(report_it,
                     usb_hid_report_description_t, reports_link);
@@ -561 +562 @@
                 }
 
-                report_it = report_it->next;
+                report_it = list_next(report_it, &report->reports);
         }
 

uspace/lib/usbhid/src/hidpath.c

@@ -250 +250 @@
                  * Path is prefix of the report_path
                  */
-                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)) {
+                report_link = list_first(&report_path->items);
+                path_link = list_first(&path->items);
+
+                while (report_link != NULL && path_link != NULL) {
 
                         report_item = list_get_instance(report_link,
@@ -268 +267 @@
                                 return 1;
                         } else {
-                                report_link = report_link->next;
-                                path_link = path_link->next;
+                                report_link = list_next(report_link, &report_path->items);
+                                path_link = list_next(path_link, &path->items);
                         }
                 }
 
                 if ((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) &&
-                    (path_link == &path->items.head)) ||
-                    ((report_link == &report_path->items.head) &&
-                    (path_link == &path->items.head))) {
+                    (path_link == NULL)) ||
+                    (report_link == NULL && path_link == NULL)) {
                         return 0;
                 } else {
@@ -287 +285 @@
                  * Path is suffix of report_path
                  */
-                report_link = report_path->items.head.prev;
-                path_link = path->items.head.prev;
+                report_link = list_last(&report_path->items);
+                path_link = list_last(&path->items);
 
                 if (list_empty(&path->items)) {
@@ -294 +292 @@
                 }
 
-                while ((report_link != &report_path->items.head) &&
-                    (path_link != &path->items.head)) {
+                while (report_link != NULL && path_link != NULL) {
                         report_item = list_get_instance(report_link,
                             usb_hid_report_usage_path_t, rpath_items_link);
@@ -308 +305 @@
                                 return 1;
                         } else {
-                                report_link = report_link->prev;
-                                path_link = path_link->prev;
+                                report_link = list_prev(report_link, &report_path->items);
+                                path_link = list_prev(path_link, &path->items);
                         }
                 }
 
-                if (path_link == &path->items.head) {
+                if (path_link == NULL) {
                         return 0;
                 } else {