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

Timestamp:

2011-03-21T13:43:27Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

361e61b, 5971dd3, 8a951ca

Parents:

0e45e7f (diff), 925e099 (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:

OHCI hc driver software side implementation

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -183 +183 @@
 
                         device_keeper_set_toggle(data->manager,
-                            instance->target, td_toggle(&data->tds[i]));
+                            instance->target, instance->direction,
+                            td_toggle(&data->tds[i]));
                         if (i > 0)
                                 goto substract_ret;
@@ -238 +239 @@
 {
         assert(instance);
+        instance->direction = USB_DIRECTION_IN;
         batch_data(instance, USB_PID_IN);
         instance->next_step = batch_call_in_and_dispose;
@@ -252 +254 @@
 {
         assert(instance);
+        instance->direction = USB_DIRECTION_OUT;
         /* We are data out, we are supposed to provide data */
         memcpy(instance->transport_buffer, instance->buffer,
@@ -270 +273 @@
         assert(instance);
         batch_data(instance, USB_PID_IN);
+        instance->direction = USB_DIRECTION_IN;
         instance->next_step = batch_call_in_and_dispose;
         usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
@@ -283 +287 @@
 {
         assert(instance);
+        instance->direction = USB_DIRECTION_OUT;
         /* We are data out, we are supposed to provide data */
         memcpy(instance->transport_buffer, instance->buffer,
@@ -306 +311 @@
 
         const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = device_keeper_get_toggle(data->manager, instance->target);
+        int toggle = device_keeper_get_toggle(
+            data->manager, instance->target, instance->direction);
         assert(toggle == 0 || toggle == 1);
 
@@ -337 +343 @@
         }
         td_set_ioc(&data->tds[packet - 1]);
-        device_keeper_set_toggle(data->manager, instance->target, toggle);
+        device_keeper_set_toggle(data->manager, instance->target,
+            instance->direction, toggle);
 }
 /*----------------------------------------------------------------------------*/