Changeset 5620bd4 in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-03-06T18:38:55Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57c0a7e

Parents:

98807e16

Message:

Integrate device_keeper into bathc structure

Check every control write for toggle reset

File:

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

uspace/drv/uhci-hcd/iface.c

@@ -114 +114 @@
 
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
-            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_interrupt_out(batch, &hc->device_manager);
+            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
+            &hc->device_manager);
+        if (!batch)
+                return ENOMEM;
+        batch_interrupt_out(batch);
         return EOK;
 }
@@ -133 +134 @@
 
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
-            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_interrupt_in(batch, &hc->device_manager);
+            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
+                        &hc->device_manager);
+        if (!batch)
+                return ENOMEM;
+        batch_interrupt_in(batch);
         return EOK;
 }
@@ -153 +155 @@
 
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
-            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_bulk_out(batch, &hc->device_manager);
+            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
+            &hc->device_manager);
+        if (!batch)
+                return ENOMEM;
+        batch_bulk_out(batch);
         return EOK;
 }
@@ -172 +175 @@
 
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
-            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_bulk_in(batch, &hc->device_manager);
+            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
+            &hc->device_manager);
+        if (!batch)
+                return ENOMEM;
+        batch_bulk_in(batch);
         return EOK;
 }
@@ -191 +195 @@
             target.address, target.endpoint, size, max_packet_size);
 
+        if (setup_size != 8)
+                return EINVAL;
+
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
             max_packet_size, speed, data, size, setup_data, setup_size,
-            NULL, callback, arg);
-        if (!batch)
-                return ENOMEM;
+            NULL, callback, arg, &hc->device_manager);
+        if (!batch)
+                return ENOMEM;
+        device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
         batch_control_write(batch);
         return EOK;
@@ -214 +222 @@
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
             max_packet_size, speed, data, size, setup_data, setup_size, callback,
-            NULL, arg);
+            NULL, arg, &hc->device_manager);
         if (!batch)
                 return ENOMEM;