Changes in uspace/drv/bus/usb/ohci/main.c [2ef8023:920d0fc] in mainline

File:

• uspace/drv/bus/usb/ohci/main.c (modified) (2 diffs)

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

@@ -33 +33 @@
  * Main routines of OHCI driver.
  */
-
-#include <assert.h>
 #include <ddf/driver.h>
 #include <errno.h>
-#include <io/log.h>
 #include <str_error.h>
 
 #include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
 
-#include "hc.h"
+#include "ohci.h"
 
 #define NAME "ohci"
-// TODO: This should be merged to hc_interrupt
-static void ohci_interrupt(hcd_t *hcd, uint32_t status)
-{
-        assert(hcd);
-        if (hcd->driver.data)
-                hc_interrupt(hcd->driver.data, status);
-}
-
-static int ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
-{
-        assert(hcd);
-        assert(hcd->driver.data == NULL);
-
-        hc_t *instance = malloc(sizeof(hc_t));
-        if (!instance)
-                return ENOMEM;
-
-        const int ret =  hc_init(instance, res, irq);
-        if (ret == EOK)
-                hcd_set_implementation(hcd, instance, hc_schedule,
-                    ohci_endpoint_init, ohci_endpoint_fini, ohci_interrupt);
-        return ret;
-}
-
-static void ohci_driver_fini(hcd_t *hcd)
-{
-        assert(hcd);
-        if (hcd->driver.data)
-                hc_fini(hcd->driver.data);
-
-        free(hcd->driver.data);
-        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL);
-}
 
 /** Initializes a new ddf driver instance of OHCI hcd.
@@ -90 +53 @@
         assert(device);
 
-        const int ret = ddf_hcd_device_setup_all(device, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11,
-            ddf_hcd_gen_irq_handler, hc_gen_irq_code,
-            ohci_driver_init, ohci_driver_fini);
+        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",
-            ddf_dev_get_name(device));
+        usb_log_info("Controlling new OHCI device '%s'.\n", ddf_dev_get_name(device));
 
-        return ret;
+        return EOK;
 }
 
-static const driver_ops_t ohci_driver_ops = {
+static driver_ops_t ohci_driver_ops = {
         .dev_add = ohci_dev_add,
 };
 
-static const driver_t ohci_driver = {
+static driver_t ohci_driver = {
         .name = NAME,
         .driver_ops = &ohci_driver_ops