Changeset 8ff0bd2 in mainline for uspace/drv/bus/usb/uhci/hc.h

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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_hcd/hc.h ) (4 diffs)

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

@@ -84 +84 @@
         /** SOF modification to match external timers */
         uint8_t sofmod;
-} regs_t;
+} uhci_regs_t;
 
 #define UHCI_FRAME_LIST_COUNT 1024
@@ -100 +100 @@
 
         /** Addresses of I/O registers */
-        regs_t *registers;
+        uhci_regs_t *registers;
 
         /** Frame List contains 1024 link pointers */
@@ -116 +116 @@
         /** 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;
@@ -132 +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);