Changes in uspace/drv/bus/usb/ehci/main.c [b7fd2a0:e0a5d4c] in mainline

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (3 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -2 +2 @@
  * Copyright (c) 2011 Jan Vesely
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty, Petr Manek
  * All rights reserved.
  *
@@ -35 +36 @@
  */
 
-#include <ddf/driver.h>
-#include <ddf/interrupt.h>
-#include <device/hw_res.h>
-#include <errno.h>
-#include <str_error.h>
 #include <io/logctl.h>
-
-#include <usb_iface.h>
-#include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/hcd.h>
 
 #include "res.h"
 #include "hc.h"
-#include "ehci_endpoint.h"
 
 #define NAME "ehci"
 
-static errno_t ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
-static void ehci_driver_fini(hcd_t *);
+static const hc_driver_t ehci_driver = {
+        .name = NAME,
+        .hc_device_size = sizeof(hc_t),
 
-static const ddf_hc_driver_t ehci_hc_driver = {
+        .hc_add = hc_add,
+        .irq_code_gen = hc_gen_irq_code,
         .claim = disable_legacy,
-        .hc_speed = USB_SPEED_HIGH,
-        .irq_code_gen = ehci_hc_gen_irq_code,
-        .init = ehci_driver_init,
-        .fini = ehci_driver_fini,
-        .name = "EHCI-PCI",
-        .ops = {
-                .schedule       = ehci_hc_schedule,
-                .ep_add_hook    = ehci_endpoint_init,
-                .ep_remove_hook = ehci_endpoint_fini,
-                .irq_hook       = ehci_hc_interrupt,
-                .status_hook    = ehci_hc_status,
-        }
+        .start = hc_start,
+        .setup_root_hub = hc_setup_roothub,
+        .hc_gone = hc_gone,
 };
-
-
-static errno_t ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
-    bool irq)
-{
-        assert(hcd);
-        assert(hcd_get_driver_data(hcd) == NULL);
-
-        hc_t *instance = malloc(sizeof(hc_t));
-        if (!instance)
-                return ENOMEM;
-
-        const errno_t ret = hc_init(instance, res, irq);
-        if (ret == EOK) {
-                hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops);
-        } else {
-                free(instance);
-        }
-        return ret;
-}
-
-static void ehci_driver_fini(hcd_t *hcd)
-{
-        assert(hcd);
-        hc_t *hc = hcd_get_driver_data(hcd);
-        if (hc)
-                hc_fini(hc);
-
-        free(hc);
-        hcd_set_implementation(hcd, NULL, NULL);
-}
-
-/** Initializes a new ddf driver instance of EHCI hcd.
- *
- * @param[in] device DDF instance of the device to initialize.
- * @return Error code.
- */
-static errno_t ehci_dev_add(ddf_dev_t *device)
-{
-        usb_log_debug("ehci_dev_add() called\n");
-        assert(device);
-
-        return hcd_ddf_add_hc(device, &ehci_hc_driver);
-
-}
-
-
-static const driver_ops_t ehci_driver_ops = {
-        .dev_add = ehci_dev_add,
-};
-
-static const driver_t ehci_driver = {
-        .name = NAME,
-        .driver_ops = &ehci_driver_ops
-};
-
 
 /** Initializes global driver structures (NONE).
@@ -139 +68 @@
         log_init(NAME);
         logctl_set_log_level(NAME, LVL_NOTE);
-        return ddf_driver_main(&ehci_driver);
+        return hc_driver_main(&ehci_driver);
 }