Changeset 3f03199 in mainline for kernel/generic/src/console/console.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:

• kernel/generic/src/console/console.c (modified) (2 diffs)

kernel/generic/src/console/console.c

@@ -125 +125 @@
 static void stdout_write(outdev_t *dev, wchar_t ch)
 {
-        list_foreach(dev->list, cur) {
-                outdev_t *sink = list_get_instance(cur, outdev_t, link);
+        list_foreach(dev->list, link, outdev_t, sink) {
                 if ((sink) && (sink->op->write))
                         sink->op->write(sink, ch);
@@ -134 +133 @@
 static void stdout_redraw(outdev_t *dev)
 {
-        list_foreach(dev->list, cur) {
-                outdev_t *sink = list_get_instance(cur, outdev_t, link);
+        list_foreach(dev->list, link, outdev_t, sink) {
                 if ((sink) && (sink->op->redraw))
                         sink->op->redraw(sink);