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

Timestamp:

2011-03-06T19:01:09Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

960bee9, c867a216

Parents:

24d5432 (diff), 8a20380 (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:

Fix toggle protocol implementation

File:

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

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);
 
 
@@ -61 +62 @@
     char* setup_buffer, size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,
-    usbhc_iface_transfer_out_callback_t func_out, void *arg)
+    usbhc_iface_transfer_out_callback_t func_out, void *arg,
+    device_keeper_t *manager
+    )
 {
         assert(func_in == NULL || func_out == NULL);
@@ -137 +140 @@
         instance->arg = arg;
         instance->speed = speed;
+        instance->manager = manager;
 
         queue_head_element_td(instance->qh, addr_to_phys(instance->tds));
@@ -160 +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;
@@ -232 +239 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_data(batch_t *instance, usb_packet_id pid)
+void batch_data(batch_t *instance, usb_packet_id pid)
 {
         assert(instance);
         const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = 1;
+        int toggle = device_keeper_get_toggle(instance->manager, instance->target);
+        assert(toggle == 0 || toggle == 1);
 
         size_t packet = 0;
@@ -245 +253 @@
                     - remain_size;
 
-                toggle = 1 - toggle;
 
                 const size_t packet_size =
@@ -256 +263 @@
                     &instance->tds[packet + 1]);
 
+                toggle = 1 - toggle;
                 ++packet;
                 assert(packet <= instance->packets);
@@ -261 +269 @@
                 remain_size -= packet_size;
         }
+        device_keeper_set_toggle(instance->manager, instance->target, toggle);
 
         instance->tds[packet - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
@@ -266 +275 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_control(batch_t *instance,
+void batch_control(batch_t *instance,
    usb_packet_id data_stage, usb_packet_id status_stage)
 {
@@ -347 +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);
@@ -355 +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)
 {