Changeset 9e195e2c in mainline for uspace/drv/ohci/main.c

Timestamp:

2011-05-12T09:03:00Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d59d0bb

Parents:

456aea3 (diff), c372e03 (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 development

File:

• uspace/drv/ohci/main.c (modified) (3 diffs)

uspace/drv/ohci/main.c

@@ -43 +43 @@
 #define NAME "ohci"
 
-static int ohci_add_device(ddf_dev_t *device);
+/** Initializes a new ddf driver instance of OHCI hcd.
+ *
+ * @param[in] device DDF instance of the device to initialize.
+ * @return Error code.
+ */
+static int ohci_add_device(ddf_dev_t *device)
+{
+        usb_log_debug("ohci_add_device() called\n");
+        assert(device);
+
+        int ret = device_setup_ohci(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to initialize OHCI driver: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
+        usb_log_info("Controlling new OHCI device '%s'.\n", device->name);
+
+        return EOK;
+}
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ohci_driver_ops = {
@@ -53 +72 @@
         .driver_ops = &ohci_driver_ops
 };
-/*----------------------------------------------------------------------------*/
-/** Initializes a new ddf driver instance of OHCI hcd.
- *
- * @param[in] device DDF instance of the device to initialize.
- * @return Error code.
- */
-int ohci_add_device(ddf_dev_t *device)
-{
-        usb_log_debug("ohci_add_device() called\n");
-        assert(device);
-        ohci_t *ohci = malloc(sizeof(ohci_t));
-        if (ohci == NULL) {
-                usb_log_error("Failed to allocate OHCI driver.\n");
-                return ENOMEM;
-        }
-
-        int ret = ohci_init(ohci, device);
-        if (ret != EOK) {
-                usb_log_error("Failed to initialize OHCI driver: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-        device->driver_data = ohci;
-
-        usb_log_info("Controlling new OHCI device `%s'.\n", device->name);
-
-        return EOK;
-}
 /*----------------------------------------------------------------------------*/
 /** Initializes global driver structures (NONE).
@@ -93 +84 @@
 {
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
-        sleep(5);
         return ddf_driver_main(&ohci_driver);
 }