Changeset 12b8e03 in mainline for uspace/drv/uhci-rhd/root_hub.c

Timestamp:

2011-04-14T13:59:04Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0146d41, 8fb3981

Parents:

fa0f53b (diff), 8d517c3 (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 development/ changes

File:

• uspace/drv/uhci-rhd/root_hub.c (modified) (4 diffs)

uspace/drv/uhci-rhd/root_hub.c

@@ -33 +33 @@
  */
 #include <errno.h>
+#include <str_error.h>
 #include <ddi.h>
 #include <usb/debug.h>
@@ -43 +44 @@
  * @param[in] addr Address of I/O registers.
  * @param[in] size Size of available I/O space.
- * @param[in] rh Pointer to ddf instance of the root hub driver.
+ * @param[in] rh Pointer to DDF instance of the root hub driver.
  * @return Error code.
  */
@@ -58 +59 @@
         if (ret < 0) {
                 usb_log_error(
-                    "Failed(%d) to gain access to port registers at %p\n",
-                    ret, regs);
+                    "Failed(%d) to gain access to port registers at %p: %s.\n",
+                    ret, regs, str_error(ret));
                 return ret;
         }
@@ -66 +67 @@
         unsigned i = 0;
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
-                /* NOTE: mind pointer arithmetics here */
                 ret = uhci_port_init(
-                    &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
+                    &instance->ports[i], &regs[i], i, ROOT_HUB_WAIT_USEC, rh);
                 if (ret != EOK) {
                         unsigned j = 0;