Changeset cc7575c in mainline

Timestamp:

2014-01-25T17:10:00Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

49dc984

Parents:

21f36e04

Message:

ehci: add IOC option to td initialization

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_batch.c (modified) (4 diffs)
• hw_struct/transfer_descriptor.c (modified) (2 diffs)
• hw_struct/transfer_descriptor.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -284 +284 @@
         td_init(
             ehci_batch->tds[0], ehci_batch->tds[1], USB_DIRECTION_BOTH,
-            buffer, ehci_batch->usb_batch->setup_size, toggle);
+            buffer, ehci_batch->usb_batch->setup_size, toggle, false);
         usb_log_debug("Created CONTROL SETUP TD: %08x:%08x:%08x",
             ehci_batch->tds[0]->status, ehci_batch->tds[0]->next,
@@ -299 +299 @@
 
                 td_init(ehci_batch->tds[td_current],
-                    ehci_batch->tds[td_current + 1],
-                    data_dir, buffer, transfer_size, toggle);
+                    ehci_batch->tds[td_current + 1], data_dir, buffer,
+                    transfer_size, toggle, false);
                 usb_log_debug("Created CONTROL DATA TD: %08x:%08x:%08x",
                     ehci_batch->tds[td_current]->status,
@@ -315 +315 @@
         assert(td_current == ehci_batch->td_count - 1);
         td_init(ehci_batch->tds[td_current], ehci_batch->tds[td_current + 1],
-            status_dir, NULL, 0, 1);
+            status_dir, NULL, 0, 1, true);
         usb_log_debug("Created CONTROL STATUS TD: %08x:%08x:%08x",
             ehci_batch->tds[td_current]->status,
@@ -357 +357 @@
                 td_init(
                     ehci_batch->tds[td_current], ehci_batch->tds[td_current + 1],
-                    dir, buffer, transfer_size, -1);
+                    dir, buffer, transfer_size, -1, remain_size == transfer_size);
 
                 usb_log_debug("Created DATA TD: %08x:%08x:%08x",

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c

@@ -81 +81 @@
  */
 void td_init(td_t *instance, const td_t *next,
-    usb_direction_t direction, const void *buffer, size_t size, int toggle)
+    usb_direction_t direction, const void *buffer, size_t size, int toggle,
+    bool ioc)
 {
         assert(instance);
@@ -89 +90 @@
         EHCI_MEM32_WR(instance->status,
             ((dir[direction] & TD_STATUS_PID_MASK) << TD_STATUS_PID_SHIFT) |
-            ((size & TD_STATUS_TOTAL_MASK) << TD_STATUS_TOTAL_SHIFT));
+            ((size & TD_STATUS_TOTAL_MASK) << TD_STATUS_TOTAL_SHIFT) |
+            (ioc ? TD_STATUS_IOC_FLAG : 0) );
 
         if (toggle == 0 || toggle == 1) {

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h

@@ -90 +90 @@
 
 void td_init(td_t *td, const td_t *next, usb_direction_t dir, const void * buf,
-    size_t buf_size, int toggle);
+    size_t buf_size, int toggle, bool ioc);
 
 #endif