Changeset 46b881c in mainline for uspace/srv/net/nil

Timestamp:

2011-01-29T11:36:41Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b6931a, 8add9ca5

Parents:

e26a4633 (diff), ffa2c8ef (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:

IPC/async: strictly isolate the use of low-level IPC methods (ipc_*) and async framework methods (async_*) in user code, do not allow a mixture of both in a single source file

Benefits for future plans

• The async framework could use different communication style under the hood, but keeping the same high-level API
• The async framework can be integrated more tightly with sessions without potential problems of intermixing session-aware async methods with session-unaware low-level methods in user code
• The async_serialize_start()/_end() can be deprecated more easily

Location:

uspace/srv/net/nil

Files:

• eth/eth.c (modified) (3 diffs)
• nildummy/nildummy.c (modified) (3 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -43 +43 @@
 #include <str.h>
 #include <errno.h>
-
-#include <ipc/ipc.h>
 #include <ipc/nil.h>
 #include <ipc/net.h>
 #include <ipc/services.h>
-
 #include <net/modules.h>
 #include <net_checksum.h>
@@ -242 +239 @@
                         nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall),
                             IPC_GET_STATE(*icall));
-                        ipc_answer_0(iid, EOK);
+                        async_answer_0(iid, EOK);
                         break;
                 case NET_NIL_RECEIVED:
@@ -251 +248 @@
                                     IPC_GET_DEVICE(*icall), packet, 0);
                         
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 

uspace/srv/net/nil/nildummy/nildummy.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <str.h>
-#include <ipc/ipc.h>
 #include <ipc/nil.h>
 #include <ipc/net.h>
@@ -112 +111 @@
                         rc = nil_device_state_msg_local(0,
                             IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall));
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
@@ -122 +121 @@
                                     IPC_GET_DEVICE(*icall), packet, 0);
                         
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
                 default:
-                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }