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

Timestamp:

2011-02-01T00:08:46Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

993a1e1

Parents:

37ac7bb

Message:

uhci-rhd - UHCI Root hub drier as a separated process

this wil deffinitely need a lot of polishing

File:

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

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include "iface.h"
 #include "name.h"
+#include "pci.h"
+#include "root_hub.h"
 #include "uhci.h"
 
@@ -75 +77 @@
             io_reg_base, io_reg_size, irq);
 
-        return uhci_init(device, (void*)io_reg_base, io_reg_size);
+        int ret = uhci_init(device, (void*)io_reg_base, io_reg_size);
+
+        if (ret != EOK) {
+                uhci_print_error("Failed to init uhci-hcd.\n");
+                return ret;
+        }
+        device_t *rh;
+        ret = setup_root_hub(&rh, device);
+
+        if (ret != EOK) {
+                uhci_print_error("Failed to setup uhci root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        ret = child_device_register(rh, device);
+        if (ret != EOK) {
+                uhci_print_error("Failed to register root hub.\n");
+                /* TODO: destroy uhci here */
+                return ret;
+        }
+
+        return EOK;
 }