Changes in uspace/drv/bus/usb/uhci/hc.h [7de1988c:9f6cb910] in mainline

File:

• uspace/drv/bus/usb/uhci/hc.h (modified) (6 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 <macros.h>
+#include <stdbool.h>
+#include <sys/types.h>
 #include <usb/host/hcd.h>
+#include <usb/host/usb_transfer_batch.h>
 
+#include "uhci_rh.h"
 #include "transfer_list.h"
+#include "hw_struct/link_pointer.h"
 
 /** UHCI I/O registers layout */
 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)
@@ -57 +62 @@
 
         /** 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)
@@ -68 +73 @@
 
         /** Interrupt enabled registers */
-        uint16_t usbintr;
+        ioport16_t usbintr;
 #define UHCI_INTR_SHORT_PACKET (1 << 3)
 #define UHCI_INTR_COMPLETE (1 << 2)
@@ -75 +80 @@
 
         /** 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;
+
+        PADD8[3];
+        ioport16_t ports[];
 } uhci_regs_t;
 
 #define UHCI_FRAME_LIST_COUNT 1024
-#define UHCI_INT_EMULATOR_TIMEOUT 10000
 #define UHCI_DEBUGER_TIMEOUT 5000000
 #define UHCI_ALLOWED_HW_FAIL 5
-#define UHCI_NEEDED_IRQ_COMMANDS 5
 
 /** Main UHCI driver structure */
 typedef struct hc {
-        /** Generic HCD driver structure */
-        hcd_t generic;
-
+        uhci_rh_t rh;
         /** Addresses of I/O registers */
         uhci_regs_t *registers;
@@ -112 +116 @@
         /** Pointer table to the above lists, helps during scheduling */
         transfer_list_t *transfers[2][4];
-        /** Fibril periodically checking status register*/
-        fid_t interrupt_emulator;
         /** Indicator of hw interrupts availability */
         bool hw_interrupts;
@@ -121 +123 @@
 } hc_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, addr_range_t *regs, bool interupts);
+int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interupts);
+void hc_fini(hc_t *instance);
 
-/** Safely dispose host controller internal structures
- *
- * @param[in] instance Host controller structure to use.
- */
-static inline void hc_fini(hc_t *instance) {} /* TODO: implement*/
+int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res);
+
+void uhci_hc_interrupt(hcd_t *hcd, uint32_t status);
+int uhci_hc_status(hcd_t *hcd, uint32_t *status);
+int uhci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
+
 #endif