Changeset 925a21e in mainline for uspace/drv/bus/usb/uhci/hc.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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/device_keeper.h>
-#include <usb/host/usb_endpoint_manager.h>
-#include <usb/host/batch.h>
+#include <usb/host/hcd.h>
 
 #include "transfer_list.h"
@@ -94 +92 @@
 /** Main UHCI driver structure */
 typedef struct hc {
-        /** USB bus driver, devices and addresses */
-        usb_device_keeper_t manager;
-        /** USB bus driver, endpoints */
-        usb_endpoint_manager_t ep_manager;
+        /** Generic HCD driver structure */
+        hcd_t generic;
 
         /** Addresses of I/O registers */
@@ -124 +120 @@
         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);
+void hc_interrupt(hc_t *instance, uint16_t status);
 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);
 
 /** Safely dispose host controller internal structures
@@ -135 +131 @@
  * @param[in] instance Host controller structure to use.
  */
-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;
-}
+static inline void hc_fini(hc_t *instance) {} /* TODO: implement*/
 #endif
 /**