Changeset 25a179e in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2017-12-20T19:51:45Z (6 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.

File:

• uspace/lib/c/generic/devman.c (modified) (17 diffs)

uspace/lib/c/generic/devman.c

@@ -182 +182 @@
         ipc_call_t answer;
         aid_t req = async_send_2(exch, DEVMAN_DRIVER_REGISTER, 0, 0, &answer);
-        sysarg_t retval = async_data_write_start(exch, name, str_size(name));
+        int retval = async_data_write_start(exch, name, str_size(name));
         
         devman_exchange_end(exch);
@@ -222 +222 @@
         aid_t req = async_send_3(exch, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype,
             devh, match_count, &answer);
-        sysarg_t retval = async_data_write_start(exch, name, str_size(name));
+        int retval = async_data_write_start(exch, name, str_size(name));
         if (retval != EOK) {
                 devman_exchange_end(exch);
@@ -272 +272 @@
         aid_t req = async_send_1(exch, DEVMAN_ADD_DEVICE_TO_CATEGORY,
             devman_handle, &answer);
-        sysarg_t retval = async_data_write_start(exch, cat_name,
+        int retval = async_data_write_start(exch, cat_name,
             str_size(cat_name));
         
@@ -310 +310 @@
 {
         async_exch_t *exch;
-        sysarg_t retval;
+        int retval;
         
         exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER);
@@ -316 +316 @@
         devman_exchange_end(exch);
         
-        return (int) retval;
+        return retval;
 }
 
@@ -325 +325 @@
                 return ENOMEM;
         
-        sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_ONLINE, funh);
-        
-        devman_exchange_end(exch);
-        return (int) retval;
+        int retval = async_req_1_0(exch, DEVMAN_DRV_FUN_ONLINE, funh);
+        
+        devman_exchange_end(exch);
+        return retval;
 }
 
@@ -337 +337 @@
                 return ENOMEM;
         
-        sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_OFFLINE, funh);
-        
-        devman_exchange_end(exch);
-        return (int) retval;
+        int retval = async_req_1_0(exch, DEVMAN_DRV_FUN_OFFLINE, funh);
+        
+        devman_exchange_end(exch);
+        return retval;
 }
 
@@ -374 +374 @@
         aid_t req = async_send_2(exch, DEVMAN_DEVICE_GET_HANDLE, flags, 0,
             &answer);
-        sysarg_t retval = async_data_write_start(exch, pathname,
+        int retval = async_data_write_start(exch, pathname,
             str_size(pathname));
         
@@ -405 +405 @@
         ipc_call_t dreply;
         size_t act_size;
-        sysarg_t dretval;
+        int dretval;
         
         exch = devman_exchange_begin_blocking(INTERFACE_DDF_CLIENT);
@@ -421 +421 @@
         }
         
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         
@@ -476 +476 @@
                 return ENOMEM;
         
-        sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_ONLINE, funh);
-        
-        devman_exchange_end(exch);
-        return (int) retval;
+        int retval = async_req_1_0(exch, DEVMAN_FUN_ONLINE, funh);
+        
+        devman_exchange_end(exch);
+        return retval;
 }
 
@@ -488 +488 @@
                 return ENOMEM;
         
-        sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_OFFLINE, funh);
-        
-        devman_exchange_end(exch);
-        return (int) retval;
+        int retval = async_req_1_0(exch, DEVMAN_FUN_OFFLINE, funh);
+        
+        devman_exchange_end(exch);
+        return retval;
 }
 
@@ -510 +510 @@
         }
         
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         
@@ -580 +580 @@
                 return ENOMEM;
         
-        sysarg_t retval = async_req_1_1(exch, DEVMAN_FUN_GET_CHILD,
+        int retval = async_req_1_1(exch, DEVMAN_FUN_GET_CHILD,
             funh, devh);
         
         devman_exchange_end(exch);
-        return (int) retval;
+        return retval;
 }
 
@@ -600 +600 @@
                 return ENOMEM;
         
-        sysarg_t retval = async_req_1_1(exch, DEVMAN_DEV_GET_PARENT,
+        int retval = async_req_1_1(exch, DEVMAN_DEV_GET_PARENT,
             devh, funh);
         
         devman_exchange_end(exch);
-        return (int) retval;
+        return retval;
 }
 
@@ -613 +613 @@
                 return ENOMEM;
         
-        sysarg_t retval = async_req_1_1(exch, DEVMAN_FUN_SID_TO_HANDLE,
+        int retval = async_req_1_1(exch, DEVMAN_FUN_SID_TO_HANDLE,
             sid, handle);
         
         devman_exchange_end(exch);
-        return (int) retval;
+        return retval;
 }
 
@@ -643 +643 @@
         ipc_call_t answer;
         aid_t req = async_send_0(exch, DEVMAN_DRIVER_GET_HANDLE, &answer);
-        sysarg_t retval = async_data_write_start(exch, drvname,
+        int retval = async_data_write_start(exch, drvname,
             str_size(drvname));