Changeset 132ab5d1 in mainline for uspace/lib/c/generic/iplink_srv.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/c/generic/iplink_srv.c (modified) (8 diffs)

uspace/lib/c/generic/iplink_srv.c

@@ -78 +78 @@
                 async_answer_0(callid, rc);
         
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -89 +89 @@
         ipc_callid_t callid;
 
-        rc = async_data_write_receive(&callid, &size);
-        if (rc != EOK) {
-                async_answer_0(callid, (sysarg_t) rc);
-                async_answer_0(iid, (sysarg_t) rc);
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
         }
 
@@ -105 +104 @@
                 async_answer_0(callid, rc);
         
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -128 +127 @@
         int rc = async_data_write_finalize(callid, &addr, size);
         if (rc != EOK) {
-                async_answer_0(callid, (sysarg_t) rc);
-                async_answer_0(iid, (sysarg_t) rc);
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
         }
         
         rc = srv->ops->addr_add(srv, &addr);
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -156 +155 @@
         int rc = async_data_write_finalize(callid, &addr, size);
         if (rc != EOK) {
-                async_answer_0(callid, (sysarg_t) rc);
-                async_answer_0(iid, (sysarg_t) rc);
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
         }
         
         rc = srv->ops->addr_remove(srv, &addr);
-        async_answer_0(iid, (sysarg_t) rc);
+        async_answer_0(iid, rc);
 }
 
@@ -205 +204 @@
         int rc = async_data_write_finalize(callid, &sdu.dest, size);
         if (rc != EOK) {
-                async_answer_0(callid, (sysarg_t) rc);
-                async_answer_0(iid, (sysarg_t) rc);
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
         }
         
@@ -322 +321 @@
         }
         
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         if (retval != EOK)
@@ -348 +347 @@
         }
         
-        sysarg_t retval;
+        int retval;
         async_wait_for(req, &retval);
         if (retval != EOK)