Changeset 25a179e in mainline for uspace/srv/devman

Timestamp:

2017-12-20T19:51:45Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f96b6c8

Parents:

d4a829e

Message:

IPC return values are always errno constants. Adjust types to reflect that.

In principle, IPC server is not allowed to return non-errno values via
the "main" return value, because kernel interprets it (e.g. EHANGUP).
It's still possible to return arbitrary additional return values alongside EOK,
which are not interpreted in normal communication.

Location:

uspace/srv/devman

Files:

• client_conn.c (modified) (5 diffs)
• driver.c (modified) (6 diffs)
• drv_conn.c (modified) (4 diffs)

uspace/srv/devman/client_conn.c

@@ -400 +400 @@
         fibril_rwlock_read_unlock(&device_tree.rwlock);
         
-        sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size);
+        int retval = async_data_read_finalize(callid, hdl_buf, size);
         free(hdl_buf);
         
@@ -451 +451 @@
         fun_del_ref(fun);
         
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -476 +476 @@
         fun_del_ref(fun);
         
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -532 +532 @@
         }
         
-        sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size);
+        int retval = async_data_read_finalize(callid, hdl_buf, size);
         free(hdl_buf);
         
@@ -572 +572 @@
         }
         
-        sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size);
+        int retval = async_data_read_finalize(callid, hdl_buf, size);
         free(hdl_buf);
         

uspace/srv/devman/driver.c

@@ -309 +309 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         
         log_msg(LOG_DEFAULT, LVL_DEBUG, "stop_driver(drv=\"%s\")", drv->name);
@@ -591 +591 @@
         
         /* Send the device name to the driver. */
-        sysarg_t rc = async_data_write_start(exch, dev->pfun->name,
+        int rc = async_data_write_start(exch, dev->pfun->name,
             str_size(dev->pfun->name) + 1);
         
@@ -621 +621 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         driver_t *drv;
         devman_handle_t handle;
@@ -644 +644 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         driver_t *drv;
         devman_handle_t handle;
@@ -667 +667 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         driver_t *drv;
         devman_handle_t handle;
@@ -695 +695 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         driver_t *drv;
         devman_handle_t handle;

uspace/srv/devman/drv_conn.c

@@ -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);
 }
 
@@ -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);
 }