Changes in uspace/drv/bus/usb/ohci/hc.h [5a6cc679:b7fd2a0] in mainline

File:

• uspace/drv/bus/usb/ohci/hc.h (modified) (3 diffs)

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

@@ -52 +52 @@
 #include "ohci_regs.h"
 #include "ohci_rh.h"
-#include "ohci_bus.h"
 #include "endpoint_list.h"
 #include "hw_struct/hcca.h"
@@ -58 +57 @@
 /** Main OHCI driver structure */
 typedef struct hc {
-        /** Common hcd header */
-        hc_device_t base;
-
         /** Memory mapped I/O registers area */
         ohci_regs_t *registers;
-        
         /** Host controller communication area structure */
         hcca_t *hcca;
@@ -69 +64 @@
         /** Transfer schedules */
         endpoint_list_t lists[4];
+        /** List of active transfers */
+        list_t pending_batches;
 
-        /** List of active endpoints */
-        list_t pending_endpoints;
+        /** Fibril for periodic checks if interrupts can't be used */
+        fid_t interrupt_emulator;
 
         /** Guards schedule and endpoint manipulation */
         fibril_mutex_t guard;
 
+        /** interrupts available */
+        bool hw_interrupts;
+
         /** USB hub emulation structure */
         ohci_rh_t rh;
-
-        /** USB bookkeeping */
-        ohci_bus_t bus;
 } hc_t;
 
-static inline hc_t * hcd_to_hc(hc_device_t *hcd)
-{
-        assert(hcd);
-        return (hc_t *) hcd;
-}
-
-extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *);
-extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
-extern errno_t hc_gain_control(hc_device_t *);
-extern errno_t hc_start(hc_device_t *);
-extern errno_t hc_setup_roothub(hc_device_t *);
-extern errno_t hc_gone(hc_device_t *);
+extern errno_t hc_init(hc_t *, const hw_res_list_parsed_t *, bool);
+extern void hc_fini(hc_t *);
 
 extern void hc_enqueue_endpoint(hc_t *, const endpoint_t *);
 extern void hc_dequeue_endpoint(hc_t *, const endpoint_t *);
 
-extern errno_t ohci_hc_schedule(usb_transfer_batch_t *);
-extern errno_t ohci_hc_status(bus_t *, uint32_t *);
-extern void ohci_hc_interrupt(bus_t *, uint32_t);
+errno_t ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res, int *irq);
+
+extern void ohci_hc_interrupt(hcd_t *, uint32_t);
+extern errno_t ohci_hc_status(hcd_t *, uint32_t *);
+extern errno_t ohci_hc_schedule(hcd_t *, usb_transfer_batch_t *);
 
 #endif