Changeset 132ab5d1 in mainline for uspace/lib/drv/generic/remote_nic.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/drv/generic/remote_nic.c (modified) (21 diffs)

uspace/lib/drv/generic/remote_nic.c

@@ -105 +105 @@
         aid_t req = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
             NIC_SEND_MESSAGE, &answer);
-        sysarg_t retval = async_data_write_start(exch, data, size);
+        int retval = async_data_write_start(exch, data, size);
         
         async_exchange_end(exch);
@@ -131 +131 @@
         ipc_call_t answer;
         int rc;
-        sysarg_t retval;
+        int retval;
         
         async_exch_t *exch = async_exchange_begin(dev_sess);
@@ -147 +147 @@
         
         async_wait_for(req, &retval);
-        return (int) retval;
+        return retval;
 }
 
@@ -210 +210 @@
         async_exchange_end(exch);
         
-        sysarg_t res;
+        int res;
         async_wait_for(aid, &res);
         
@@ -216 +216 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }
 
@@ -237 +237 @@
         async_exchange_end(exch);
         
-        sysarg_t res;
+        int res;
         async_wait_for(aid, &res);
         
@@ -243 +243 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }
 
@@ -295 +295 @@
         async_exchange_end(exch);
 
-        sysarg_t res;
+        int res;
         async_wait_for(aid, &res);
         
@@ -301 +301 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }
 
@@ -629 +629 @@
         async_exchange_end(exch);
         
-        sysarg_t res;
+        int res;
         async_wait_for(message_id, &res);
         
@@ -635 +635 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }
 
@@ -717 +717 @@
         async_exchange_end(exch);
         
-        sysarg_t res;
+        int res;
         async_wait_for(message_id, &res);
         
@@ -723 +723 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }
 
@@ -878 +878 @@
         async_exchange_end(exch);
         
-        sysarg_t res;
+        int res;
         async_wait_for(message_id, &res);
         
@@ -884 +884 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }
 
@@ -938 +938 @@
         async_exchange_end(exch);
         
-        sysarg_t res;
+        int res;
         async_wait_for(message_id, &res);
         
@@ -944 +944 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }
 
@@ -997 +997 @@
             NIC_WOL_VIRTUE_ADD, (sysarg_t) type, send_data, &result);
         
-        sysarg_t res;
+        int res;
         if (send_data) {
                 int rc = async_data_write_start(exch, data, length);
@@ -1011 +1011 @@
         
         *id = IPC_GET_ARG1(result);
-        return (int) res;
+        return res;
 }
 
@@ -1311 +1311 @@
         async_exchange_end(exch);
         
-        sysarg_t res;
+        int res;
         async_wait_for(message_id, &res);
         
@@ -1317 +1317 @@
                 return rc;
         
-        return (int) res;
+        return res;
 }