Changeset a81a1d09 in mainline for uspace/drv/ohci/hc.h

Timestamp:

2011-05-11T16:49:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/drv/ohci/hc.h (modified) (2 diffs)

uspace/drv/ohci/hc.h

@@ -51 +51 @@
 #include "hw_struct/hcca.h"
 
+#define OHCI_NEEDED_IRQ_COMMANDS 5
+
 typedef struct hc {
         ohci_regs_t *registers;
@@ -65 +67 @@
         fid_t interrupt_emulator;
         fibril_mutex_t guard;
+
+        /** Code to be executed in kernel interrupt handler */
+        irq_code_t interrupt_code;
+
+        /** Commands that form interrupt code */
+        irq_cmd_t interrupt_commands[OHCI_NEEDED_IRQ_COMMANDS];
 } hc_t;
 
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
 
-int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
-     uintptr_t regs, size_t reg_size, bool interrupts);
+int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts);
+
+void hc_start_hw(hc_t *instance);
 
 /** Safely dispose host controller internal structures