Changeset 3375bd4 in mainline for uspace/drv/vhc/transfer.c

Timestamp:

2011-05-17T07:44:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

File:

• uspace/drv/vhc/transfer.c (modified) (2 diffs)

uspace/drv/vhc/transfer.c

@@ -4 +4 @@
 #include <usbvirt/ipc.h>
 #include "vhcd.h"
-
-#define list_foreach(pos, head) \
-        for (pos = (head)->next; pos != (head); \
-                pos = pos->next)
 
 vhc_transfer_t *vhc_transfer_create(usb_address_t address, usb_endpoint_t ep,
@@ -67 +63 @@
         fibril_mutex_lock(&vhc->guard);
 
-        link_t *pos;
         bool target_found = false;
-        list_foreach(pos, &vhc->devices) {
+        list_foreach(vhc->devices, pos) {
                 vhc_virtdev_t *dev = list_get_instance(pos, vhc_virtdev_t, link);
                 fibril_mutex_lock(&dev->guard);