Changeset f959a20f in mainline for uspace/drv

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/drv/bus/usb

Files:

• ehci/endpoint_list.c (modified) (1 diff)
• ohci/endpoint_list.c (modified) (2 diffs)
• uhci/transfer_list.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/endpoint_list.c

@@ -160 +160 @@
         const char *qpos = NULL;
         qh_t *prev_qh;
+        link_t *prev = list_prev(&ep->eplist_link, &instance->endpoint_list);
+
         /* Remove from the hardware queue */
-        if (list_first(&instance->endpoint_list) == &ep->eplist_link) {
+        if (!prev) {
                 /* I'm the first one here */
                 prev_qh = instance->list_head;
                 qpos = "FIRST";
         } else {
-                prev_qh = ehci_endpoint_list_instance(ep->eplist_link.prev)->qh;
+                prev_qh = ehci_endpoint_list_instance(prev)->qh;
                 qpos = "NOT FIRST";
         }

uspace/drv/bus/usb/ohci/endpoint_list.c

@@ -156 +156 @@
         const char *qpos = NULL;
         ed_t *prev_ed;
+        link_t *prev_link = list_prev(&ep->eplist_link, &instance->endpoint_list);
         /* Remove from the hardware queue */
-        if (list_first(&instance->endpoint_list) == &ep->eplist_link) {
+        if (!prev_link) {
                 /* I'm the first one here */
                 prev_ed = instance->list_head;
@@ -163 +164 @@
         } else {
                 ohci_endpoint_t *prev =
-                    list_get_instance(ep->eplist_link.prev, ohci_endpoint_t, eplist_link);
+                    list_get_instance(prev_link, ohci_endpoint_t, eplist_link);
                 prev_ed = prev->ed;
                 qpos = "NOT FIRST";

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -233 +233 @@
         const char *qpos = "FIRST";
         qh_t *prev_qh = instance->queue_head;
+        link_t *prev = list_prev(&uhci_batch->link, &instance->batch_list);
         /* Remove from the hardware queue */
-        if (list_first(&instance->batch_list) != &uhci_batch->link) {
+        if (prev) {
                 /* There is a batch in front of me */
-                prev_qh =
-                    uhci_transfer_batch_from_link(uhci_batch->link.prev)->qh;
+                prev_qh = uhci_transfer_batch_from_link(prev)->qh;
                 qpos = "NOT FIRST";
         }