Changeset e42dd32 in mainline for uspace/drv/ohci/batch.c

Timestamp:

2011-04-08T23:28:52Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f1be95c8

Parents:

b854e56

Message:

OCHI structures fixed, setup control transfer

File:

• uspace/drv/ohci/batch.c (modified) (5 diffs)

uspace/drv/ohci/batch.c

@@ -49 +49 @@
 } ohci_batch_t;
 
-static void batch_control(usb_transfer_batch_t *instance);
+static void batch_control(usb_transfer_batch_t *instance,
+    usb_direction_t data_dir, usb_direction_t status_dir);
 static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
 static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
@@ -135 +136 @@
             instance->buffer_size);
         instance->next_step = batch_call_out_and_dispose;
-        batch_control(instance);
+        batch_control(instance, USB_DIRECTION_OUT, USB_DIRECTION_IN);
         usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
 }
@@ -143 +144 @@
         assert(instance);
         instance->next_step = batch_call_in_and_dispose;
-        batch_control(instance);
+        batch_control(instance, USB_DIRECTION_IN, USB_DIRECTION_OUT);
         usb_log_debug("Batch(%p) CONTROL READ initialized.\n", instance);
 }
@@ -194 +195 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_control(usb_transfer_batch_t *instance)
+void batch_control(usb_transfer_batch_t *instance,
+    usb_direction_t data_dir, usb_direction_t status_dir)
 {
         assert(instance);
@@ -200 +202 @@
         assert(data);
         ed_init(data->ed, instance->ep);
+        ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
+        usb_log_debug("Created ED: %x:%x:%x:%x.\n", data->ed->status,
+            data->ed->td_tail, data->ed->td_head, data->ed->next);
+        int toggle = 0;
+        /* setup stage */
+        td_init(&data->tds[0], USB_DIRECTION_BOTH, instance->setup_buffer,
+                instance->setup_size, toggle);
+        td_set_next(&data->tds[0], &data->tds[1]);
+        usb_log_debug("Created SETUP TD: %x:%x:%x:%x.\n", data->tds[0].status,
+            data->tds[0].cbp, data->tds[0].next, data->tds[0].be);
+
+        /* data stage */
+        size_t td_current = 1;
+        size_t remain_size = instance->buffer_size;
+        char *transfer_buffer = instance->transport_buffer;
+        while (remain_size > 0) {
+                size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ?
+                    OHCI_TD_MAX_TRANSFER : remain_size;
+                toggle = 1 - toggle;
+
+                td_init(&data->tds[td_current], data_dir, transfer_buffer,
+                    transfer_size, toggle);
+                td_set_next(&data->tds[td_current], &data->tds[td_current + 1]);
+                usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
+                    data->tds[td_current].status, data->tds[td_current].cbp,
+                    data->tds[td_current].next, data->tds[td_current].be);
+
+                transfer_buffer += transfer_size;
+                remain_size -= transfer_size;
+                assert(td_current < data->td_count - 2);
+                ++td_current;
+        }
+
+        /* status stage */
+        assert(td_current == data->td_count - 2);
+        td_init(&data->tds[td_current], status_dir, NULL, 0, 1);
+        usb_log_debug("Created STATUS TD: %x:%x:%x:%x.\n",
+            data->tds[td_current].status, data->tds[td_current].cbp,
+            data->tds[td_current].next, data->tds[td_current].be);
 }
 /*----------------------------------------------------------------------------*/