Changeset f1fae414 in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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 mainline changes.

File:

• uspace/drv/bus/usb/ohci/hc.c (moved) (moved from uspace/drv/ohci/hc.c ) (5 diffs)

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

@@ -65 +65 @@
             device_keeper_get_free_address(&instance->manager, USB_SPEED_FULL);
         if (hub_address <= 0) {
-                usb_log_error("Failed(%d) to get OHCI root hub address.\n",
-                    hub_address);
+                usb_log_error("Failed to get OHCI root hub address: %s\n",
+                    str_error(hub_address));
                 return hub_address;
         }
@@ -357 +357 @@
                     instance->registers->periodic_current);
 
-                link_t *current = instance->pending_batches.next;
-                while (current != &instance->pending_batches) {
+                link_t *current = instance->pending_batches.head.next;
+                while (current != &instance->pending_batches.head) {
                         link_t *next = current->next;
                         usb_transfer_batch_t *batch =
@@ -367 +367 @@
                                 usb_transfer_batch_finish(batch);
                         }
+
                         current = next;
                 }
@@ -445 +446 @@
         /* HC is in reset (hw startup) => no other driver
          * maintain reset for at least the time specified in USB spec (50 ms)*/
-        usb_log_info("HC found in reset.\n");
+        usb_log_debug("Host controller found in reset state.\n");
         async_usleep(50000);
 }
@@ -516 +517 @@
 
         instance->registers->control &= (C_HCFS_OPERATIONAL << C_HCFS_SHIFT);
-        usb_log_info("OHCI HC up and running(%x).\n",
+        usb_log_debug("OHCI HC up and running (ctl_reg=0x%x).\n",
             instance->registers->control);
 }