Changeset da06e92 in mainline

Timestamp:

2014-01-02T20:32:46Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

972e8a9

Parents:

1a0fa29c

Message:

ohci: Use the newly provided helpers.

Location:

uspace/drv/bus/usb/ohci

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (2 diffs)
• ohci.c (deleted)
• ohci.h (deleted)

uspace/drv/bus/usb/ohci/Makefile

@@ -48 +48 @@
         hc.c \
         main.c \
-        ohci.c \
         ohci_batch.c \
         ohci_endpoint.c \

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

@@ -41 +41 @@
 
 #include <usb/debug.h>
+#include <usb/host/ddf_helpers.h>
 
-#include "ohci.h"
+#include "hc.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.
@@ -56 +90 @@
         assert(device);
 
-        int ret = device_setup_ohci(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);
         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 EOK;
+        return ret;
 }