Changeset fe1776c2 in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-02-11T12:41:11Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 from usb/development

File:

• uspace/drv/uhci-hcd/main.c (moved) (moved from uspace/drv/uhci/main.c ) (5 diffs)

uspace/drv/uhci-hcd/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky, Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <usb/hcdhubd.h>
+/** @addtogroup usb
+ * @{
+ */
+/** @file
+ * @brief UHCI driver
+ */
+#include <driver.h>
 #include <usb_iface.h>
+
+#include <errno.h>
+
 #include <usb/debug.h>
-#include <errno.h>
-#include <str_error.h>
-#include <driver.h>
+
+#include "iface.h"
+#include "pci.h"
+#include "root_hub.h"
 #include "uhci.h"
+
+#define NAME "uhci-hcd"
 
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
@@ -54 +66 @@
 static int uhci_add_device(device_t *device)
 {
-        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
+        assert(device);
+
+        usb_log_info("uhci_add_device() called\n");
         device->ops = &uhci_ops;
 
@@ -65 +79 @@
 
         if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to get I/O registers addresses: %s.\n",
-                    str_error(rc));
+                usb_log_error("Failed(%d) to get I/O registers addresses for device:.\n",
+                    rc, device->handle);
                 return rc;
         }
 
-        usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
+        usb_log_info("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);
+        uhci_t *uhci_hc = malloc(sizeof(uhci_t));
+        if (!uhci_hc) {
+                usb_log_error("Failed to allocaete memory for uhci hcd driver.\n");
+                return ENOMEM;
+        }
+
+        int ret = uhci_init(uhci_hc, (void*)io_reg_base, io_reg_size);
+        if (ret != EOK) {
+                usb_log_error("Failed to init uhci-hcd.\n");
+                return ret;
+        }
+        device_t *rh;
+        ret = setup_root_hub(&rh, device);
+
+        if (ret != EOK) {
+                usb_log_error("Failed to setup uhci root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        ret = child_device_register(rh, device);
+        if (ret != EOK) {
+                usb_log_error("Failed to register root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        device->driver_data = uhci_hc;
 
         return EOK;
@@ -98 +134 @@
          */
         sleep(5);
-        usb_dprintf_enable(NAME, 5);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         return driver_main(&uhci_driver);
 }
+/**
+ * @}
+ */