Changeset 25696fea in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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:

Merge with mainline

File:

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

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

@@ -52 +52 @@
         if (!ohci_batch)
                 return;
-        unsigned i = 0;
         if (ohci_batch->tds) {
-                for (; i< ohci_batch->td_count; ++i) {
+                for (unsigned i = 0; i < ohci_batch->td_count; ++i) {
                         if (i != ohci_batch->leave_td)
                                 free32(ohci_batch->tds[i]);
@@ -107 +106 @@
         ohci_batch->tds[0] = ohci_endpoint_get(usb_batch->ep)->td;
         ohci_batch->leave_td = 0;
-        unsigned i = 1;
-        for (; i <= ohci_batch->td_count; ++i) {
+
+        for (unsigned i = 1; i <= ohci_batch->td_count; ++i) {
                 ohci_batch->tds[i] = malloc32(sizeof(td_t));
                 CHECK_NULL_DISPOSE_RET(ohci_batch->tds[i],
@@ -160 +159 @@
         usb_log_debug("Batch %p checking %zu td(s) for completion.\n",
             ohci_batch->usb_batch, ohci_batch->td_count);
-        usb_log_debug2("ED: %x:%x:%x:%x.\n",
+        usb_log_debug2("ED: %08x:%08x:%08x:%08x.\n",
             ohci_batch->ed->status, ohci_batch->ed->td_head,
             ohci_batch->ed->td_tail, ohci_batch->ed->next);
@@ -167 +166 @@
         for (; i < ohci_batch->td_count; ++i) {
                 assert(ohci_batch->tds[i] != NULL);
-                usb_log_debug("TD %zu: %x:%x:%x:%x.\n", i,
+                usb_log_debug("TD %zu: %08x:%08x:%08x:%08x.\n", i,
                     ohci_batch->tds[i]->status, ohci_batch->tds[i]->cbp,
                     ohci_batch->tds[i]->next, ohci_batch->tds[i]->be);
@@ -175 +174 @@
                 ohci_batch->usb_batch->error = td_error(ohci_batch->tds[i]);
                 if (ohci_batch->usb_batch->error != EOK) {
-                        usb_log_debug("Batch %p found error TD(%zu):%x.\n",
+                        usb_log_debug("Batch %p found error TD(%zu):%08x.\n",
                             ohci_batch->usb_batch, i,
                             ohci_batch->tds[i]->status);
@@ -196 +195 @@
         ohci_batch->usb_batch->transfered_size =
             ohci_batch->usb_batch->buffer_size;
-        for (--i;i < ohci_batch->td_count; ++i)
+        for (--i;i < ohci_batch->td_count; ++i) {
                 ohci_batch->usb_batch->transfered_size
                     -= td_remain_size(ohci_batch->tds[i]);
+        }
 
         /* Clear possible ED HALT */
@@ -234 +234 @@
         assert(ohci_batch->usb_batch);
         assert(dir == USB_DIRECTION_IN || dir == USB_DIRECTION_OUT);
-        usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", ohci_batch->ed,
+        usb_log_debug("Using ED(%p): %08x:%08x:%08x:%08x.\n", ohci_batch->ed,
             ohci_batch->ed->status, ohci_batch->ed->td_tail,
             ohci_batch->ed->td_head, ohci_batch->ed->next);
@@ -251 +251 @@
                 ohci_batch->usb_batch->setup_size, toggle);
         td_set_next(ohci_batch->tds[0], ohci_batch->tds[1]);
-        usb_log_debug("Created CONTROL SETUP TD: %x:%x:%x:%x.\n",
+        usb_log_debug("Created CONTROL SETUP TD: %08x:%08x:%08x:%08x.\n",
             ohci_batch->tds[0]->status, ohci_batch->tds[0]->cbp,
             ohci_batch->tds[0]->next, ohci_batch->tds[0]->be);
@@ -269 +269 @@
                 td_set_next(ohci_batch->tds[td_current],
                     ohci_batch->tds[td_current + 1]);
-                usb_log_debug("Created CONTROL DATA TD: %x:%x:%x:%x.\n",
+                usb_log_debug("Created CONTROL DATA TD: %08x:%08x:%08x:%08x.\n",
                     ohci_batch->tds[td_current]->status,
                     ohci_batch->tds[td_current]->cbp,
@@ -286 +286 @@
         td_set_next(ohci_batch->tds[td_current],
             ohci_batch->tds[td_current + 1]);
-        usb_log_debug("Created CONTROL STATUS TD: %x:%x:%x:%x.\n",
+        usb_log_debug("Created CONTROL STATUS TD: %08x:%08x:%08x:%08x.\n",
             ohci_batch->tds[td_current]->status,
             ohci_batch->tds[td_current]->cbp,
@@ -312 +312 @@
         assert(ohci_batch->usb_batch);
         assert(dir == USB_DIRECTION_IN || dir == USB_DIRECTION_OUT);
-        usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", ohci_batch->ed,
+        usb_log_debug("Using ED(%p): %08x:%08x:%08x:%08x.\n", ohci_batch->ed,
             ohci_batch->ed->status, ohci_batch->ed->td_tail,
             ohci_batch->ed->td_head, ohci_batch->ed->next);
@@ -328 +328 @@
                     ohci_batch->tds[td_current + 1]);
 
-                usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
+                usb_log_debug("Created DATA TD: %08x:%08x:%08x:%08x.\n",
                     ohci_batch->tds[td_current]->status,
                     ohci_batch->tds[td_current]->cbp,