Changes in uspace/drv/bus/usb/uhci/hc.h [f58ef61:26858040] in mainline

File:

• uspace/drv/bus/usb/uhci/hc.h (modified) (4 diffs)

uspace/drv/bus/usb/uhci/hc.h

@@ -39 +39 @@
 #include <ddi.h>
 
-#include <usb/host/hcd.h>
+#include <usb/host/device_keeper.h>
+#include <usb/host/usb_endpoint_manager.h>
+#include <usb/host/batch.h>
 
 #include "transfer_list.h"
@@ -92 +94 @@
 /** Main UHCI driver structure */
 typedef struct hc {
-        /** Generic HCD driver structure */
-        hcd_t generic;
+        /** USB bus driver, devices and addresses */
+        usb_device_keeper_t manager;
+        /** USB bus driver, endpoints */
+        usb_endpoint_manager_t ep_manager;
 
         /** Addresses of I/O registers */
@@ -120 +124 @@
         unsigned hw_failures;
 } hc_t;
-
 size_t hc_irq_cmd_count(void);
 int hc_get_irq_commands(
     irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size);
+int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interupts);
+int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
 void hc_interrupt(hc_t *instance, uint16_t status);
-int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interupts);
 
 /** Safely dispose host controller internal structures
@@ -131 +135 @@
  * @param[in] instance Host controller structure to use.
  */
-static inline void hc_fini(hc_t *instance) {} /* TODO: implement*/
+static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
+
+/** Get and cast pointer to the driver data
+ *
+ * @param[in] fun DDF function pointer
+ * @return cast pointer to driver_data
+ */
+static inline hc_t * fun_to_hc(ddf_fun_t *fun)
+{
+        assert(fun);
+        return fun->driver_data;
+}
 #endif
 /**