Changes in uspace/drv/uhci/main.c [67a1b78:ea991e84] in mainline

File:

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

uspace/drv/uhci/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky, Jan Vesely
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include <usb/hcdhubd.h>
 #include <usb_iface.h>
+#include <usb/debug.h>
 #include <errno.h>
-
-#include "debug.h"
-#include "iface.h"
-#include "name.h"
+#include <str_error.h>
+#include <driver.h>
 #include "uhci.h"
 
@@ -54 +54 @@
 static int uhci_add_device(device_t *device)
 {
-        uhci_print_info( "uhci_add_device() called\n" );
+        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
         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) {
+                fprintf(stderr,
+                    NAME ": failed to get I/O registers addresses: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
+            io_reg_base, io_reg_size, irq);
+
+        /*
+         * We need to announce the presence of our root hub.
+         */
+        usb_dprintf(NAME, 2, "adding root hub\n");
+        usb_hcd_add_root_hub(device);
+
+        return EOK;
 }
 
@@ -76 +98 @@
          */
         sleep(5);
-        usb_dprintf_enable(NAME, DEBUG_LEVEL_INFO);
+        usb_dprintf_enable(NAME, 5);
 
         return driver_main(&uhci_driver);