Changes in uspace/lib/usbhost/include/usb/host/ddf_helpers.h [cccd60c3:0f6b50f] in mainline

File:

• uspace/lib/usbhost/include/usb/host/ddf_helpers.h (modified) (3 diffs)

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

@@ -38 +38 @@
 
 #include <usb/host/hcd.h>
-#include <usb/host/usb_bus.h>
+#include <usb/host/bus.h>
 #include <usb/usb.h>
 
@@ -45 +45 @@
 #include <device/hw_res_parsed.h>
 
-typedef int (*driver_init_t)(hcd_t *, const hw_res_list_parsed_t *, bool);
+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 *);
+
+typedef void (*driver_stop_t)(hcd_t *);
 typedef void (*driver_fini_t)(hcd_t *);
-typedef int (*claim_t)(ddf_dev_t *);
-typedef int (*irq_code_gen_t)(irq_code_t *, const hw_res_list_parsed_t *);
 
+/**
+ * All callbacks are optional.
+ */
 typedef struct {
         hcd_ops_t ops;
-        claim_t claim;
-        usb_speed_t hc_speed;
-        driver_init_t init;
-        driver_fini_t fini;
-        interrupt_handler_t *irq_handler;
-        irq_code_gen_t irq_code_gen;
         const char *name;
+
+        interrupt_handler_t *irq_handler;  /**< Handler of IRQ. Do have generic implementation. */
+
+        /* 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 */
+
+        /* 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, usb_speed_t max_speed,
-    size_t bw, bw_count_func_t bw_count);
+int hcd_ddf_setup_hc(ddf_dev_t *device);
 void hcd_ddf_clean_hc(ddf_dev_t *device);
-int hcd_ddf_setup_root_hub(ddf_dev_t *device);
+
+int hcd_setup_virtual_root_hub(hcd_t *, ddf_dev_t *);
+
+device_t *hcd_ddf_device_create(ddf_dev_t *, size_t);
+void hcd_ddf_device_destroy(device_t *);
+int hcd_ddf_device_explore(hcd_t *, device_t *);
 
 hcd_t *dev_to_hcd(ddf_dev_t *dev);
@@ -75 +93 @@
     const hw_res_list_parsed_t *hw_res,
     interrupt_handler_t handler,
-    int (*gen_irq_code)(irq_code_t *, const hw_res_list_parsed_t *));
+    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);