Changeset 26e7d6d in mainline for uspace/drv/bus/usb/uhci/hc.h

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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 (moved) (moved from uspace/drv/uhci/hc.h ) (6 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"
@@ -84 +82 @@
         /** SOF modification to match external timers */
         uint8_t sofmod;
-} regs_t;
+} uhci_regs_t;
 
 #define UHCI_FRAME_LIST_COUNT 1024
@@ -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 */
-        regs_t *registers;
+        uhci_regs_t *registers;
 
         /** Frame List contains 1024 link pointers */
@@ -116 +112 @@
         /** Pointer table to the above lists, helps during scheduling */
         transfer_list_t *transfers[2][4];
-
-        /** Code to be executed in kernel interrupt handler */
-        irq_code_t interrupt_code;
-
-        /** Commands that form interrupt code */
-        irq_cmd_t interrupt_commands[UHCI_NEEDED_IRQ_COMMANDS];
-
         /** Fibril periodically checking status register*/
         fid_t interrupt_emulator;
-
         /** Indicator of hw interrupts availability */
         bool hw_interrupts;
@@ -133 +121 @@
 } 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
@@ -143 +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
 /**