Changeset 3f03199 in mainline for uspace/drv/bus/usb/vhc/transfer.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/drv/bus/usb/vhc/transfer.c (modified) (1 diff)

uspace/drv/bus/usb/vhc/transfer.c

@@ -180 +180 @@
         int targets = 0;
 
-        list_foreach(vhc->devices, pos) {
-                vhc_virtdev_t *dev = list_get_instance(pos, vhc_virtdev_t, link);
+        list_foreach(vhc->devices, link, vhc_virtdev_t, dev) {
                 fibril_mutex_lock(&dev->guard);
                 if (dev->address == transfer->batch->ep->address) {