Changeset b5f813c in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2015-07-04T03:28:02Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

55346870

Parents:

2dbfe44

Message:

libusbhost,ehci,ohci,uhci,vhc: Pass ops structure instead of function pointers to intialization

File:

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

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

@@ -50 +50 @@
 #define NAME "ehci"
 
+static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static void ehci_driver_fini(hcd_t *);
+
+static const ddf_hc_driver_t ehci_hc_driver = {
+        .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,
+        }
+};
+
+
 static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
 {
         assert(hcd);
-        assert(hcd->driver.data == NULL);
+        assert(hcd_get_driver_data(hcd) == NULL);
 
         hc_t *instance = malloc(sizeof(hc_t));
@@ -61 +81 @@
         const int ret = hc_init(instance, res, irq);
         if (ret == EOK)
-                hcd_set_implementation(hcd, instance, ehci_hc_schedule,
-                    ehci_endpoint_init, ehci_endpoint_fini, ehci_hc_interrupt,
-                    ehci_hc_status);
+                hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops);
         return ret;
 }
@@ -70 +88 @@
 {
         assert(hcd);
-        if (hcd->driver.data)
-                hc_fini(hcd->driver.data);
+        hc_t *hc = hcd_get_driver_data(hcd);
+        if (hc)
+                hc_fini(hc);
 
-        free(hcd->driver.data);
-        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL, NULL);
+        free(hc);
+        hcd_set_implementation(hcd, NULL, NULL);
 }
-
-static int ehci_dev_add(ddf_dev_t *device);
-
-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
-};
-
-
-static const ddf_hc_driver_t ehci_hc_driver = {
-        .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"
-};
 
 /** Initializes a new ddf driver instance of EHCI hcd.
@@ -111 +109 @@
 
 }
+
+
+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).