Changes in uspace/srv/devman/drv_conn.c [96ef672:b7fd2a0] in mainline

File:

• uspace/srv/devman/drv_conn.c (modified) (15 diffs)

uspace/srv/devman/drv_conn.c

@@ -61 +61 @@
 #include "main.h"
 
-static int init_running_drv(void *drv);
+static errno_t init_running_drv(void *drv);
 
 /** Register running driver. */
@@ -72 +72 @@
         
         /* Get driver name. */
-        int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
+        errno_t rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -161 +161 @@
  *
  * @param match_ids     The list of the device's match ids.
- * @return              Zero on success, negative error code otherwise.
- */
-static int devman_receive_match_id(match_id_list_t *match_ids)
+ * @return              Zero on success, error code otherwise.
+ */
+static errno_t devman_receive_match_id(match_id_list_t *match_ids)
 {
         match_id_t *match_id = create_match_id();
         ipc_callid_t callid;
         ipc_call_t call;
-        int rc = 0;
+        errno_t rc = 0;
         
         callid = async_get_call(&call);
@@ -211 +211 @@
  * @param match_count   The number of device's match ids to be received.
  * @param match_ids     The list of the device's match ids.
- * @return              Zero on success, negative error code otherwise.
- */
-static int devman_receive_match_ids(sysarg_t match_count,
+ * @return              Zero on success, error code otherwise.
+ */
+static errno_t devman_receive_match_ids(sysarg_t match_count,
     match_id_list_t *match_ids)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         size_t i;
         
@@ -255 +255 @@
         
         char *fun_name = NULL;
-        int rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
+        errno_t rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 dev_del_ref(pdev);
@@ -332 +332 @@
         devman_handle_t handle = IPC_GET_ARG1(*call);
         category_id_t cat_id;
-        int rc;
+        errno_t rc;
         
         /* Get category name. */
@@ -381 +381 @@
 {
         fun_node_t *fun;
-        int rc;
+        errno_t rc;
         
         log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()");
@@ -407 +407 @@
                 fun_busy_unlock(fun);
                 fun_del_ref(fun);
-                async_answer_0(iid, (sysarg_t) rc);
+                async_answer_0(iid, rc);
                 return;
         }
@@ -414 +414 @@
         fun_del_ref(fun);
         
-        async_answer_0(iid, (sysarg_t) EOK);
+        async_answer_0(iid, EOK);
 }
 
@@ -425 +425 @@
 {
         fun_node_t *fun;
-        int rc;
+        errno_t rc;
 
         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -448 +448 @@
                 fun_busy_unlock(fun);
                 fun_del_ref(fun);
-                async_answer_0(iid, (sysarg_t) rc);
+                async_answer_0(iid, rc);
                 return;
         }
@@ -454 +454 @@
         fun_busy_unlock(fun);
         fun_del_ref(fun);
-        async_answer_0(iid, (sysarg_t) EOK);
+        async_answer_0(iid, EOK);
 }
 
@@ -462 +462 @@
         devman_handle_t fun_handle = IPC_GET_ARG1(*call);
         dev_tree_t *tree = &device_tree;
-        int rc;
+        errno_t rc;
         
         fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
@@ -490 +490 @@
                         dev_node_t *dev = fun->child;
                         device_state_t dev_state;
-                        int gone_rc;
+                        errno_t gone_rc;
                         
                         dev_add_ref(dev);
@@ -575 +575 @@
  * driver needed to be served by devman during the driver's initialization).
  */
-static int init_running_drv(void *drv)
+static errno_t init_running_drv(void *drv)
 {
         driver_t *driver = (driver_t *) drv;