Changeset 3f03199 in mainline for uspace/lib/gui/terminal.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/terminal.c (modified) (1 diff)

uspace/lib/gui/terminal.c

@@ -685 +685 @@
         terminal_t *term = NULL;
         
-        list_foreach(terms, link) {
-                terminal_t *cur = list_get_instance(link, terminal_t, link);
-                
+        list_foreach(terms, link, terminal_t, cur) {
                 if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
                         term = cur;