Changeset 925a21e in mainline for uspace/lib/drv/include/ddf/driver.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -81 +81 @@
          */
         devman_handle_t handle;
+        /** Reference count */
+        atomic_t refcnt;
         
         /**
@@ -104 +106 @@
         /** Function indentifier (asigned by device manager) */
         devman_handle_t handle;
+        /** Reference count */
+        atomic_t refcnt;
         
         /** Device which this function belogs to */
@@ -132 +136 @@
 typedef struct driver_ops {
         /** Callback method for passing a new device to the device driver */
-        int (*add_device)(ddf_dev_t *dev);
-        /* TODO: add other generic driver operations */
+        int (*add_device)(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 *);
 } driver_ops_t;
 
@@ -146 +157 @@
 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_class(ddf_fun_t *, const char *);
+extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);
 
 #endif