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

Timestamp:

2015-07-04T03:28:02Z (10 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/ohci/main.c (modified) (3 diffs)

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

@@ -46 +46 @@
 
 #define NAME "ohci"
+static int ohci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static void ohci_driver_fini(hcd_t *);
+
+static const ddf_hc_driver_t ohci_hc_driver = {
+        .hc_speed = USB_SPEED_FULL,
+        .irq_code_gen = ohci_hc_gen_irq_code,
+        .init = ohci_driver_init,
+        .fini = ohci_driver_fini,
+        .name = "OHCI",
+        .ops = {
+                .schedule       = ohci_hc_schedule,
+                .ep_add_hook    = ohci_endpoint_init,
+                .ep_remove_hook = ohci_endpoint_fini,
+                .irq_hook       = ohci_hc_interrupt,
+                .status_hook    = ohci_hc_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);
+        assert(hcd_get_driver_data(hcd) == NULL);
 
         hc_t *instance = malloc(sizeof(hc_t));
@@ -58 +76 @@
         const int ret = hc_init(instance, res, irq);
         if (ret == EOK)
-                hcd_set_implementation(hcd, instance, ohci_hc_schedule,
-                    ohci_endpoint_init, ohci_endpoint_fini, ohci_hc_interrupt,
-                    ohci_hc_status);
+                hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops);
         return ret;
 }
@@ -67 +83 @@
 {
         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);
+        hcd_set_implementation(hcd, NULL, NULL);
+        free(hc);
 }
-
-static const ddf_hc_driver_t ohci_hc_driver = {
-        .hc_speed = USB_SPEED_FULL,
-        .irq_code_gen = ohci_hc_gen_irq_code,
-        .init = ohci_driver_init,
-        .fini = ohci_driver_fini,
-        .name = "OHCI"
-};
 
 /** Initializes a new ddf driver instance of OHCI hcd.