Changes in uspace/lib/c/generic/devman.c [81685dd9:cde999a] in mainline

File:

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

uspace/lib/c/generic/devman.c

@@ -44 +44 @@
 #include <async.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 static FIBRIL_MUTEX_INITIALIZE(devman_driver_block_mutex);
@@ -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);
@@ -210 +210 @@
  * @param funh      Place to store handle of the new function
  *
- * @return EOK on success or negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -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));
         
@@ -305 +305 @@
  * @param funh      Devman handle of the function
  *
- * @return EOK on success or negative error code.
+ * @return EOK on success or an error code.
  */
 int devman_remove_function(devman_handle_t funh)
 {
         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);
         
@@ -529 +529 @@
  * @param data          Place to store pointer to array of handles
  * @param count         Place to store number of handles
- * @return              EOK on success or negative error code
+ * @return              EOK on success or an error code
  */
 static int devman_get_handles_internal(sysarg_t method, sysarg_t arg1,
@@ -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));