Changes in uspace/lib/drv/include/ddf/driver.h [609243f4:2a770a35] in mainline

File:

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

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

@@ -37 +37 @@
 #define DDF_DRIVER_H_
 
-#include <async.h>
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
+
 #include "../dev_iface.h"
 
@@ -81 +81 @@
          */
         devman_handle_t handle;
-        /** Reference count */
-        atomic_t refcnt;
         
         /**
-         * Session to the parent device driver (if it is different from this
+         * Phone to the parent device driver (if it is different from this
          * driver)
          */
-        async_sess_t *parent_sess;
+        int parent_phone;
         
         /** Device name */
@@ -106 +104 @@
         /** Function indentifier (asigned by device manager) */
         devman_handle_t handle;
-        /** Reference count */
-        atomic_t refcnt;
         
         /** Device which this function belogs to */
@@ -122 +118 @@
         /** 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 */
@@ -136 +130 @@
 typedef struct driver_ops {
         /** Callback method for passing a new device to the device driver */
-        int (*add_device)(ddf_dev_t *);
-        /**
-         * Notification that the device was succesfully added.
-         * The driver can do any blocking operation without
-         * blocking the device manager.
-         */
-        void (*device_added)(ddf_dev_t *dev);
-        /** 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 *);
+        int (*add_device)(ddf_dev_t *dev);
+        /* TODO: add other generic driver operations */
 } driver_ops_t;
 
@@ -163 +144 @@
 extern int ddf_driver_main(driver_t *);
 
-extern void *ddf_dev_data_alloc(ddf_dev_t *, size_t);
 extern ddf_fun_t *ddf_fun_create(ddf_dev_t *, fun_type_t, const char *);
 extern void ddf_fun_destroy(ddf_fun_t *);
-extern void *ddf_fun_data_alloc(ddf_fun_t *, size_t);
 extern int ddf_fun_bind(ddf_fun_t *);
-extern int ddf_fun_unbind(ddf_fun_t *);
-extern int ddf_fun_online(ddf_fun_t *);
-extern int ddf_fun_offline(ddf_fun_t *);
 extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
 
-extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);
+extern int ddf_fun_add_to_class(ddf_fun_t *, const char *);
 
 #endif