Changeset a60150a in mainline

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8a20380

Parents:

57c0a7e

Message:

Track toggle on errors

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (4 diffs)
• uhci_struct/transfer_descriptor.h (modified) (1 diff)

uspace/drv/uhci-hcd/batch.c

@@ -54 +54 @@
 static void batch_call_in_and_dispose(batch_t *instance);
 static void batch_call_out_and_dispose(batch_t *instance);
+static void batch_dispose(batch_t *instance);
 
 
@@ -163 +164 @@
                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
                             instance, i, instance->tds[i].status);
+
+                        device_keeper_set_toggle(instance->manager, instance->target,
+                            td_toggle(&instance->tds[i]));
                         if (i > 0)
                                 goto substract_ret;
@@ -352 +356 @@
         assert(instance);
         batch_call_in(instance);
+        batch_dispose(instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_call_out_and_dispose(batch_t *instance)
+{
+        assert(instance);
+        batch_call_out(instance);
+        batch_dispose(instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_dispose(batch_t *instance)
+{
+        assert(instance);
         usb_log_debug("Batch(%p) disposing.\n", instance);
         free32(instance->tds);
@@ -360 +377 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_call_out_and_dispose(batch_t *instance)
-{
-        assert(instance);
-        batch_call_out(instance);
-        usb_log_debug("Batch(%p) disposing.\n", instance);
-        free32(instance->tds);
-        free32(instance->qh);
-        free32(instance->setup_buffer);
-        free32(instance->transport_buffer);
-        free(instance);
-}
-/*----------------------------------------------------------------------------*/
 int batch_schedule(batch_t *instance)
 {

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

@@ -115 +115 @@
 }
 
+static inline int td_toggle(td_t *instance)
+{
+        assert(instance);
+        return ((instance->device & TD_DEVICE_DATA_TOGGLE_ONE_FLAG) != 0)
+            ? 1 : 0;
+}
+
 static inline bool td_is_active(td_t *instance)
 {