Changes in uspace/drv/uhci-hcd/uhci.h [fb78ae72:1a93bb0] in mainline

File:

• uspace/drv/uhci-hcd/uhci.h (modified) (4 diffs)

uspace/drv/uhci-hcd/uhci.h

@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <adt/list.h>
+#include <ddi.h>
 
-#include <usb/addrkeep.h>
 #include <usbhc_iface.h>
 
+#include "batch.h"
 #include "transfer_list.h"
-#include "batch.h"
+#include "utils/device_keeper.h"
 
 typedef struct uhci_regs {
@@ -81 +82 @@
 
 typedef struct uhci {
-        usb_address_keeping_t address_manager;
+        device_keeper_t device_manager;
+
         volatile regs_t *registers;
 
@@ -97 +99 @@
         fid_t cleaner;
         fid_t debug_checker;
+
+        ddf_fun_t *ddf_instance;
 } uhci_t;
 
 /* init uhci specifics in device.driver_data */
-int uhci_init(uhci_t *instance, void *regs, size_t reg_size);
+int uhci_init(uhci_t *instance, ddf_dev_t *dev, void *regs, size_t reg_size);
 
 static inline void uhci_fini(uhci_t *instance) {};
@@ -108 +112 @@
 void uhci_interrupt(uhci_t *instance, uint16_t status);
 
-static inline uhci_t * dev_to_uhci(device_t *dev)
+static inline uhci_t * dev_to_uhci(ddf_dev_t *dev)
         { return (uhci_t*)dev->driver_data; }
+
+static inline uhci_t * fun_to_uhci(ddf_fun_t *fun)
+        { return (uhci_t*)fun->driver_data; }