Changeset d6522dd in mainline

Timestamp:

2011-04-13T14:49:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

651b352, a0a134b

Parents:

7013b14

Message:

Fixes (OHCI works with new architecture)

Remove completed batch from the list of pending batches.
Do not reinitialize ED during transfer initialization

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (3 diffs)
• hc.c (modified) (1 diff)

uspace/drv/ohci/batch.c

@@ -164 +164 @@
                 }
         }
-        data->leave_td = ++i;
+        data->leave_td = i;
         assert(data->leave_td <= data->td_count);
+        hcd_endpoint_t *hcd_ep = hcd_endpoint_get(instance->ep);
+        assert(hcd_ep);
+        hcd_ep->td = data->tds[i];
+
         return true;
 }
@@ -243 +247 @@
         ohci_transfer_batch_t *data = instance->private_data;
         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(%p): %x:%x:%x:%x.\n", data->ed,
+        usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", data->ed,
             data->ed->status, data->ed->td_tail, data->ed->td_head,
             data->ed->next);
@@ -292 +294 @@
         ohci_transfer_batch_t *data = instance->private_data;
         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(%p): %x:%x:%x:%x.\n", data->ed,
+        usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", data->ed,
             data->ed->status, data->ed->td_tail, data->ed->td_head,
             data->ed->next);
 
-        /* data stage */
         size_t td_current = 0;
         size_t remain_size = instance->buffer_size;

uspace/drv/ohci/hc.c

@@ -306 +306 @@
 
                         if (batch_is_complete(batch)) {
+                                list_remove(current);
                                 usb_transfer_batch_finish(batch);
                         }