Changeset 651b352 in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-04-13T15:00:43Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8b4ce802

Parents:

4deca9b (diff), d6522dd (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:

Major rework

UHCI uses one buffer for both structures and data
OHCI uses new architecture that actually follows OHCI specification

File:

• uspace/drv/uhci-hcd/iface.c (modified) (6 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -195 +195 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -223 +223 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -251 +251 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -279 +279 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -312 +312 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;
@@ -344 +344 @@
         ret = hc_schedule(hc, batch);
         if (ret != EOK) {
-                batch_dispose(batch);
+                usb_transfer_batch_dispose(batch);
         }
         return ret;