Changeset ff381a7 in mainline for uspace/srv/devman/drv_conn.c

Timestamp:

2015-11-02T20:54:19Z (8 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/srv/devman/drv_conn.c (modified) (5 diffs)

uspace/srv/devman/drv_conn.c

@@ -49 +49 @@
 #include <io/log.h>
 #include <ipc/devman.h>
-#include <ipc/driver.h>
 #include <loc.h>
 
@@ -102 +101 @@
                     driver->name);
                 fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(callid, EEXISTS);
+                async_answer_0(callid, EEXIST);
                 return NULL;
         }
@@ -131 +130 @@
         }
         /* FIXME: Work around problem with callback sessions */
-        async_sess_args_set(driver->sess, DRIVER_DEVMAN, 0, 0);
+        async_sess_args_set(driver->sess, INTERFACE_DDF_DEVMAN, 0, 0);
         
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -279 +278 @@
                 fibril_rwlock_write_unlock(&tree->rwlock);
                 dev_del_ref(pdev);
-                async_answer_0(callid, EEXISTS);
+                async_answer_0(callid, EEXIST);
                 printf(NAME ": Warning, driver tried to register `%s' twice.\n",
                     fun_name);
@@ -587 +586 @@
 
 /** Function for handling connections from a driver to the device manager. */
-void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
+void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         client_t *client;