Changeset 224174f in mainline for uspace/drv/bus/usb/ohci/hc.h

Timestamp:

2013-07-11T13:16:57Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

2b3e8840, b2c96093

Parents:

990ab7d (diff), 3a67d63 (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/ohci/hc.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #define DRV_OHCI_HC_H
 
+#include <ddf/interrupt.h>
 #include <fibril.h>
 #include <fibril_synch.h>
@@ -74 +75 @@
 } hc_t;
 
-size_t hc_irq_pio_range_count(void);
-size_t hc_irq_cmd_count(void);
 int hc_get_irq_code(irq_pio_range_t [], size_t, irq_cmd_t [], size_t, uintptr_t,
     size_t);
+int hc_register_irq_handler(ddf_dev_t *, uintptr_t, size_t, int, interrupt_handler_t);
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
 int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts);