Changeset 8b5690f in mainline for uspace/lib/c/generic/net/modules.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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 mainline changes.

File:

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

uspace/lib/c/generic/net/modules.c

@@ -32 +32 @@
 
 /** @file
- * Generic module functions implementation. 
+ * Generic module functions implementation.
  *
  * @todo MAKE IT POSSIBLE TO REMOVE THIS FILE VIA EITHER REPLACING PART OF ITS
@@ -43 +43 @@
 #include <errno.h>
 #include <sys/time.h>
-
-#include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <net/modules.h>
 
@@ -52 +49 @@
 #define MODULE_WAIT_TIME        (10 * 1000)
 
-/** Answers the call.
- *
- * @param[in] callid    The call identifier.
- * @param[in] result    The message processing result.
- * @param[in] answer    The message processing answer.
- * @param[in] answer_count The number of answer parameters.
- */
-void
-answer_call(ipc_callid_t callid, int result, ipc_call_t *answer,
-    int answer_count)
-{
-        /* Choose the most efficient answer function */
-        if (answer || (!answer_count)) {
-                switch (answer_count) {
+/** Answer a call.
+ *
+ * @param[in] callid Call identifier.
+ * @param[in] result Message processing result.
+ * @param[in] answer Message processing answer.
+ * @param[in] count  Number of answer parameters.
+ *
+ */
+void answer_call(ipc_callid_t callid, int result, ipc_call_t *answer,
+    size_t count)
+{
+        /* Choose the most efficient function */
+        if ((answer != NULL) || (count == 0)) {
+                switch (count) {
                 case 0:
-                        ipc_answer_0(callid, (sysarg_t) result);
+                        async_answer_0(callid, (sysarg_t) result);
                         break;
                 case 1:
-                        ipc_answer_1(callid, (sysarg_t) result,
+                        async_answer_1(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer));
                         break;
                 case 2:
-                        ipc_answer_2(callid, (sysarg_t) result,
+                        async_answer_2(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer));
                         break;
                 case 3:
-                        ipc_answer_3(callid, (sysarg_t) result,
+                        async_answer_3(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer));
                         break;
                 case 4:
-                        ipc_answer_4(callid, (sysarg_t) result,
+                        async_answer_4(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer));
@@ -89 +86 @@
                 case 5:
                 default:
-                        ipc_answer_5(callid, (sysarg_t) result,
+                        async_answer_5(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer),
@@ -137 +134 @@
     sysarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
-        int rc;
-        
         /* Connect to the needed service */
         int phone = connect_to_service_timeout(need, timeout);
         if (phone >= 0) {
                 /* Request the bidirectional connection */
-                sysarg_t phonehash;
-                
-                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
+                int rc = async_connect_to_me(phone, arg1, arg2, arg3, client_receiver);
                 if (rc != EOK) {
-                        ipc_hangup(phone);
+                        async_hangup(phone);
                         return rc;
                 }
-                async_new_connection(phonehash, 0, NULL, client_receiver);
         }
         
@@ -228 +220 @@
 }
 
-/** Refreshes answer structure and parameters count.
- *
- * Erases all attributes.
- *
- * @param[in,out] answer The message processing answer structure.
- * @param[in,out] answer_count The number of answer parameters.
- */
-void refresh_answer(ipc_call_t *answer, int *answer_count)
-{
-        if (answer_count)
-                *answer_count = 0;
-
-        if (answer) {
+/** Refresh answer structure and argument count.
+ *
+ * Erase all arguments.
+ *
+ * @param[in,out] answer Message processing answer structure.
+ * @param[in,out] count  Number of answer arguments.
+ *
+ */
+void refresh_answer(ipc_call_t *answer, size_t *count)
+{
+        if (count != NULL)
+                *count = 0;
+        
+        if (answer != NULL) {
                 IPC_SET_RETVAL(*answer, 0);
-                /* Just to be precise */
                 IPC_SET_IMETHOD(*answer, 0);
                 IPC_SET_ARG1(*answer, 0);