Changes in uspace/drv/bus/usb/uhci/hc.h [1ae74c6:d52ab7b] in mainline

File:

• uspace/drv/bus/usb/uhci/hc.h (modified) (7 diffs)

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

@@ -36 +36 @@
 #define DRV_UHCI_HC_H
 
+#include <ddf/interrupt.h>
+#include <device/hw_res_parsed.h>
 #include <fibril.h>
 #include <usb/host/hcd.h>
@@ -44 +46 @@
 typedef struct uhci_regs {
         /** Command register, controls HC behaviour */
-        uint16_t usbcmd;
+        ioport16_t usbcmd;
 #define UHCI_CMD_MAX_PACKET (1 << 7)
 #define UHCI_CMD_CONFIGURE  (1 << 6)
@@ -55 +57 @@
 
         /** Status register, 1 means interrupt is asserted (if enabled) */
-        uint16_t usbsts;
+        ioport16_t usbsts;
 #define UHCI_STATUS_HALTED (1 << 5)
 #define UHCI_STATUS_PROCESS_ERROR (1 << 4)
@@ -66 +68 @@
 
         /** Interrupt enabled registers */
-        uint16_t usbintr;
+        ioport16_t usbintr;
 #define UHCI_INTR_SHORT_PACKET (1 << 3)
 #define UHCI_INTR_COMPLETE (1 << 2)
@@ -73 +75 @@
 
         /** Register stores frame number used in SOF packet */
-        uint16_t frnum;
+        ioport16_t frnum;
 
         /** Pointer(physical) to the Frame List */
-        uint32_t flbaseadd;
+        ioport32_t flbaseadd;
 
         /** SOF modification to match external timers */
-        uint8_t sofmod;
+        ioport8_t sofmod;
 } uhci_regs_t;
 
@@ -119 +121 @@
 } 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 *, addr_range_t *, int,
+    interrupt_handler_t);
+int hc_get_irq_code(irq_pio_range_t [], size_t, irq_cmd_t [], size_t,
+    addr_range_t *);
 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_init(hc_t *instance, addr_range_t *regs, bool interupts);
 
 /** Safely dispose host controller internal structures
@@ -132 +134 @@
 static inline void hc_fini(hc_t *instance) {} /* TODO: implement*/
 #endif
+
 /**
  * @}