Changes in uspace/lib/drv/include/ddf/driver.h [56fd7cf:77a69ea] in mainline

File:

• uspace/lib/drv/include/ddf/driver.h (modified) (5 diffs)

uspace/lib/drv/include/ddf/driver.h

@@ -42 +42 @@
 #include "../dev_iface.h"
 
+typedef struct ddf_dev ddf_dev_t;
+typedef struct ddf_fun ddf_fun_t;
 
 /*
  * Device
  */
-
-typedef struct ddf_dev ddf_dev_t;
-typedef struct ddf_fun ddf_fun_t;
 
 /** Devices operations */
@@ -76 +75 @@
 
 /** Device structure */
-struct ddf_dev;
+struct ddf_dev {
+        /**
+         * Globally unique device identifier (assigned to the device by the
+         * device manager).
+         */
+        devman_handle_t handle;
+        /** Reference count */
+        atomic_t refcnt;
+        
+        /**
+         * Session to the parent device driver (if it is different from this
+         * driver)
+         */
+        async_sess_t *parent_sess;
+        
+        /** Device name */
+        const char *name;
+        
+        /** Driver-specific data associated with this device */
+        void *driver_data;
+        
+        /** Link in the list of devices handled by the driver */
+        link_t link;
+};
 
 /** Function structure */
-struct ddf_fun;
+struct ddf_fun {
+        /** True if bound to the device manager */
+        bool bound;
+        /** Function indentifier (asigned by device manager) */
+        devman_handle_t handle;
+        /** Reference count */
+        atomic_t refcnt;
+        
+        /** Device which this function belogs to */
+        ddf_dev_t *dev;
+        
+        /** Function type */
+        fun_type_t ftype;
+        /** Function name */
+        const char *name;
+        /** List of device ids for driver matching */
+        match_id_list_t match_ids;
+        /** Driver-specific data associated with this function */
+        void *driver_data;
+        /** Implementation of operations provided by this function */
+        ddf_dev_ops_t *ops;
+        /** Connection handler or @c NULL to use the DDF default handler. */
+        async_client_conn_t conn_handler;
+        
+        /** Link in the list of functions handled by the driver */
+        link_t link;
+};
 
 /*
@@ -89 +137 @@
         /** Callback method for passing a new device to the device driver */
         int (*dev_add)(ddf_dev_t *);
-        
         /** Ask driver to remove a device */
         int (*dev_remove)(ddf_dev_t *);
-        
         /** Inform driver a device disappeared */
         int (*dev_gone)(ddf_dev_t *);
-        
         /** Ask driver to online a specific function */
         int (*fun_online)(ddf_fun_t *);
-        
         /** Ask driver to offline a specific function */
         int (*fun_offline)(ddf_fun_t *);
@@ -111 +155 @@
 } driver_t;
 
-/** XXX Only to transition USB */
-#ifdef _DDF_DATA_IMPLANT
-extern void ddf_fun_data_implant(ddf_fun_t *, void *);
-#endif
-
 extern int ddf_driver_main(driver_t *);
 
 extern void *ddf_dev_data_alloc(ddf_dev_t *, size_t);
-extern void *ddf_dev_data_get(ddf_dev_t *);
-extern devman_handle_t ddf_dev_get_handle(ddf_dev_t *);
-extern const char *ddf_dev_get_name(ddf_dev_t *);
-extern async_sess_t *ddf_dev_parent_sess_create(ddf_dev_t *, exch_mgmt_t);
-extern async_sess_t *ddf_dev_parent_sess_get(ddf_dev_t *);
 extern ddf_fun_t *ddf_fun_create(ddf_dev_t *, fun_type_t, const char *);
-extern devman_handle_t ddf_fun_get_handle(ddf_fun_t *);
 extern void ddf_fun_destroy(ddf_fun_t *);
 extern void *ddf_fun_data_alloc(ddf_fun_t *, size_t);
-extern void *ddf_fun_data_get(ddf_fun_t *);
-extern const char *ddf_fun_get_name(ddf_fun_t *);
-extern int ddf_fun_set_name(ddf_fun_t *, const char *);
-extern ddf_dev_t *ddf_fun_get_dev(ddf_fun_t *);
 extern int ddf_fun_bind(ddf_fun_t *);
 extern int ddf_fun_unbind(ddf_fun_t *);
@@ -137 +166 @@
 extern int ddf_fun_offline(ddf_fun_t *);
 extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
-extern void ddf_fun_set_ops(ddf_fun_t *, ddf_dev_ops_t *);
-extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_client_conn_t);
+
 extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);