Changeset 3f03199 in mainline for uspace/lib/gui/connection.c

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.

File:

• uspace/lib/gui/connection.c (modified) (8 diffs)

uspace/lib/gui/connection.c

@@ -65 +65 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link) {
-                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
+        list_foreach(connection_list, link, signal_node_t, cur) {
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -88 +87 @@
 
         slot_node_t *slt_node = NULL;
-        list_foreach(sig_node->slots, link) {
-                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
+        list_foreach(sig_node->slots, link, slot_node_t, cur) {
                 if (cur->widget == widget && cur->slot == slot) {
                         slt_node = cur;
@@ -121 +119 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link) {
-                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
+        list_foreach(connection_list, link, signal_node_t, cur) {
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -135 +132 @@
 
         slot_node_t *slt_node = NULL;
-        list_foreach(sig_node->slots, link) {
-                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
+        list_foreach(sig_node->slots, link, slot_node_t, cur) {
                 if (cur->widget == widget && cur->slot == slot) {
                         slt_node = cur;
@@ -164 +160 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link) {
-                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
+        list_foreach(connection_list, link, signal_node_t, cur) {
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -177 +172 @@
         }
 
-        list_foreach(sig_node->slots, link) {
-                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
+        list_foreach(sig_node->slots, link, slot_node_t, cur) {
                 cur->slot(cur->widget, data);
         }
@@ -190 +184 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link) {
-                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
+        list_foreach(connection_list, link, signal_node_t, cur) {
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -203 +196 @@
         }
 
-        list_foreach(sig_node->slots, link) {
-                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
-
+        list_foreach(sig_node->slots, link, slot_node_t, cur) {
                 void *data_copy = NULL;
                 if (data != NULL) {