Changeset 4687fcd4 in mainline for uspace/drv/uhci/main.c

Timestamp:

2011-01-29T10:19:04Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

72e19f50

Parents:

67a1b78 (diff), a09128c (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:

Changes from devel, break stuff.

File:

• uspace/drv/uhci/main.c (modified) (2 diffs)

uspace/drv/uhci/main.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include <driver.h>
+#include <errno.h>
+#include <str_error.h>
 #include <usb_iface.h>
-#include <errno.h>
 
 #include "debug.h"
@@ -57 +59 @@
         device->ops = &uhci_ops;
 
-        // TODO: get this value out of pci driver
-        return uhci_init(device, (void*)0xc020);
+        uintptr_t io_reg_base;
+        size_t io_reg_size;
+        int irq;
+
+        int rc = pci_get_my_registers(device,
+            &io_reg_base, &io_reg_size, &irq);
+
+        if (rc != EOK) {
+                uhci_print_fatal("failed to get I/O registers addresses: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        uhci_print_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
+            io_reg_base, io_reg_size, irq);
+
+        return uhci_init(device, (void*)io_reg_base, io_reg_size);
 }