Changeset 19b3cc6 in mainline for uspace/lib/drv

Timestamp:

2014-01-17T23:12:10Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (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 libdrv-cleanup branch (includes mainline changes)

Location:

uspace/lib/drv

Files:

• generic/driver.c (modified) (1 diff)
• generic/private/driver.h (modified) (1 diff)
• include/ddf/driver.h (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -920 +920 @@
 
 /** Set function ops. */
-void ddf_fun_set_ops(ddf_fun_t *fun, ddf_dev_ops_t *dev_ops)
+void ddf_fun_set_ops(ddf_fun_t *fun, const ddf_dev_ops_t *dev_ops)
 {
         assert(fun->conn_handler == NULL);

uspace/lib/drv/generic/private/driver.h

@@ -93 +93 @@
         
         /** Implementation of operations provided by this function */
-        ddf_dev_ops_t *ops;
+        const ddf_dev_ops_t *ops;
         
         /** Connection handler or @c NULL to use the DDF default handler. */

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

@@ -137 +137 @@
 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_ops(ddf_fun_t *, const 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 *);