Changeset 70d72dd in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2011-10-16T14:24:05Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d5abaf4

Parents:

9515f674

Message:

ohci: OHCI TD routines refactoring.

Merge td_set_next to td_init: td list is built during initialization.
Add doxygen and other comments.
Add ed_inactive and ed_transfer_pending routines, these will be used later.

File:

• uspace/drv/bus/usb/ohci/ohci_batch.c (modified) (4 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -248 +248 @@
 
         /* setup stage */
-        td_init(ohci_batch->tds[0], USB_DIRECTION_BOTH, buffer,
-                ohci_batch->usb_batch->setup_size, toggle);
-        td_set_next(ohci_batch->tds[0], ohci_batch->tds[1]);
+        td_init(
+            ohci_batch->tds[0], ohci_batch->tds[1], USB_DIRECTION_BOTH,
+            buffer, ohci_batch->usb_batch->setup_size, toggle);
         usb_log_debug("Created CONTROL SETUP TD: %08x:%08x:%08x:%08x.\n",
             ohci_batch->tds[0]->status, ohci_batch->tds[0]->cbp,
@@ -265 +265 @@
                 toggle = 1 - toggle;
 
-                td_init(ohci_batch->tds[td_current], data_dir, buffer,
-                    transfer_size, toggle);
-                td_set_next(ohci_batch->tds[td_current],
-                    ohci_batch->tds[td_current + 1]);
+                td_init(ohci_batch->tds[td_current],
+                    ohci_batch->tds[td_current + 1],
+                    data_dir, buffer, transfer_size, toggle);
                 usb_log_debug("Created CONTROL DATA TD: %08x:%08x:%08x:%08x.\n",
                     ohci_batch->tds[td_current]->status,
@@ -283 +282 @@
         /* status stage */
         assert(td_current == ohci_batch->td_count - 1);
-        td_init(ohci_batch->tds[td_current], status_dir, NULL, 0, 1);
-        td_set_next(ohci_batch->tds[td_current],
-            ohci_batch->tds[td_current + 1]);
+        td_init(ohci_batch->tds[td_current], ohci_batch->tds[td_current + 1],
+            status_dir, NULL, 0, 1);
         usb_log_debug("Created CONTROL STATUS TD: %08x:%08x:%08x:%08x.\n",
             ohci_batch->tds[td_current]->status,
@@ -323 +321 @@
                     ? OHCI_TD_MAX_TRANSFER : remain_size;
 
-                td_init(ohci_batch->tds[td_current], dir, buffer,
-                    transfer_size, -1);
-                td_set_next(ohci_batch->tds[td_current],
-                    ohci_batch->tds[td_current + 1]);
+                td_init(
+                    ohci_batch->tds[td_current], ohci_batch->tds[td_current + 1],
+                    dir, buffer, transfer_size, -1);
 
                 usb_log_debug("Created DATA TD: %08x:%08x:%08x:%08x.\n",