Changeset 32fb6bce in mainline for uspace/lib/usbhost/include/usb/host/ddf_helpers.h

Timestamp:

2017-12-18T22:50:21Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7f70d1c

Parents:

1ea0bbf

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:04:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:50:21)

Message:

usbhost: refactoring

This commit moves interrupt, status and schedule to bus
operations. Then the purpose of hcd_t is better defined, and split into
hc_driver_t and hc_device_t. hc_driver_t is used to wrap driver
implementation by the library (similar to how usb_driver_t is used to
wrap usb device drivers). hc_device_t is used as a parent for hc_t
inside drivers, and is allocated inside the DDF device node.

To support these changes, some local identifiers were renamed, some
functions were moved and/or renamed and their arguments changed. The
most notable one being hcd_send_batch → bus_device_send_batch.

File:

• uspace/lib/usbhost/include/usb/host/ddf_helpers.h (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -39 +39 @@
 #include <ddf/driver.h>
 #include <ddf/interrupt.h>
-#include <device/hw_res_parsed.h>
 #include <usb/usb.h>
 
 #include <usb/host/hcd.h>
 
-typedef int (*driver_init_t)(hcd_t *, const hw_res_list_parsed_t *, ddf_dev_t *);
-typedef int (*irq_code_gen_t)(irq_code_t *, hcd_t *, const hw_res_list_parsed_t *);
-typedef int (*claim_t)(hcd_t *, ddf_dev_t *);
-typedef int (*driver_start_t)(hcd_t *, bool irq);
-typedef int (*setup_root_hub_t)(hcd_t *, ddf_dev_t *);
+int hcd_ddf_setup_hc(ddf_dev_t *, size_t);
+void hcd_ddf_clean_hc(hc_device_t *);
 
-typedef void (*driver_stop_t)(hcd_t *);
-typedef void (*driver_fini_t)(hcd_t *);
+int hcd_setup_virtual_root_hub(hc_device_t *);
 
-/**
- * All callbacks are optional.
- */
-typedef struct {
-        hcd_ops_t ops;
-        const char *name;
+device_t *hcd_ddf_fun_create(hc_device_t *);
+void hcd_ddf_fun_destroy(device_t *);
 
-        interrupt_handler_t *irq_handler;  /**< Handler of IRQ. Do have generic implementation. */
+int hcd_device_explore(device_t *);
 
-        /* Initialization sequence: */
-        driver_init_t init;                /**< Initialize internal structures, memory */
-        claim_t claim;                     /**< Claim device from BIOS */
-        irq_code_gen_t irq_code_gen;       /**< Generate IRQ handling code */
-        driver_start_t start;              /**< Start the HC */
-        setup_root_hub_t setup_root_hub;   /**< Setup the root hub */
+int hcd_ddf_enable_interrupt(hc_device_t *hcd, int);
+int hcd_ddf_get_registers(hc_device_t *hcd, hw_res_list_parsed_t *hw_res);
 
-        /* Destruction sequence: */
-        driver_stop_t stop;                /**< Stop the HC (counterpart of start) */
-        driver_fini_t fini;                /**< Destroy internal structures (counterpart of init) */
-} ddf_hc_driver_t;
-
-int hcd_ddf_add_hc(ddf_dev_t *device, const ddf_hc_driver_t *driver);
-
-int hcd_ddf_setup_hc(ddf_dev_t *device);
-void hcd_ddf_clean_hc(ddf_dev_t *device);
-
-int hcd_setup_virtual_root_hub(hcd_t *, ddf_dev_t *);
-
-device_t *hcd_ddf_device_create(ddf_dev_t *, bus_t *);
-void hcd_ddf_device_destroy(device_t *);
-int hcd_ddf_device_explore(device_t *);
-int hcd_ddf_device_online(ddf_fun_t *);
-int hcd_ddf_device_offline(ddf_fun_t *);
-
-hcd_t *dev_to_hcd(ddf_dev_t *dev);
-
-int hcd_ddf_enable_interrupt(ddf_dev_t *device, int);
-int hcd_ddf_get_registers(ddf_dev_t *device, hw_res_list_parsed_t *hw_res);
-int hcd_ddf_setup_interrupts(ddf_dev_t *device,
-    const hw_res_list_parsed_t *hw_res,
-    interrupt_handler_t handler,
-    irq_code_gen_t gen_irq_code);
-void ddf_hcd_gen_irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev);
+void hcd_ddf_gen_irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev);
 
 #endif