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

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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) (2 diffs)

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

@@ -117 +117 @@
 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_create(ddf_dev_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 *);
@@ -133 +133 @@
 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 void ddf_fun_set_conn_handler(ddf_fun_t *, async_port_handler_t);
 extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);