Changes in uspace/lib/c/generic/devman.c [0b5a4131:96b02eb9] in mainline

File:

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

uspace/lib/c/generic/devman.c

@@ -95 +95 @@
         aid_t req = async_send_2(phone, DEVMAN_DRIVER_REGISTER, 0, 0, &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -104 +104 @@
         async_set_client_connection(conn);
         
-        ipcarg_t callback_phonehash;
+        sysarg_t callback_phonehash;
         ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
         async_wait_for(req, &retval);
@@ -116 +116 @@
 {
         ipc_call_t answer;
-        async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
+        aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
         int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id));
-        return retval;  
+        async_wait_for(req, NULL);
+        return retval;
 }
 
@@ -154 +155 @@
         aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer);
 
-        ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
+        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -191 +192 @@
         aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
+        sysarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
         if (retval != EOK) {
                 async_wait_for(req, NULL);
@@ -267 +268 @@
             &answer);
         
-        ipcarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
+        sysarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
         if (retval != EOK) {
                 async_wait_for(req, NULL);