Changeset 73751c0 in mainline for uspace/drv/uhci-hcd/batch.c

Timestamp:

2011-03-18T12:16:36Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b495a93

Parents:

42a3a57 (diff), b64eac6 (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 with usb/development

File:

• uspace/drv/uhci-hcd/batch.c (modified) (3 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -153 +153 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Mark batch as failed and continue with next step.
+ *
+ * @param[in] instance Batch structure to use.
+ *
+ */
+void batch_abort(batch_t *instance)
+{
+        assert(instance);
+        instance->error = EIO;
+        instance->next_step(instance);
+}
+/*----------------------------------------------------------------------------*/
 /** Check batch TDs for activity.
  *
@@ -251 +263 @@
         assert(instance);
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
+        memcpy(instance->transport_buffer, instance->buffer,
+            instance->buffer_size);
         batch_data(instance, USB_PID_OUT);
         instance->next_step = batch_call_out_and_dispose;
@@ -281 +294 @@
         assert(instance);
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
+        memcpy(instance->transport_buffer, instance->buffer,
+            instance->buffer_size);
         batch_data(instance, USB_PID_OUT);
         instance->next_step = batch_call_out_and_dispose;