Changeset 87b4baa in mainline for uspace/lib/c/generic/net/modules.c

Timestamp:

2010-12-17T20:16:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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) (7 diffs)

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

@@ -67 +67 @@
                 switch (answer_count) {
                 case 0:
-                        ipc_answer_0(callid, (ipcarg_t) result);
+                        ipc_answer_0(callid, (sysarg_t) result);
                         break;
                 case 1:
-                        ipc_answer_1(callid, (ipcarg_t) result,
+                        ipc_answer_1(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer));
                         break;
                 case 2:
-                        ipc_answer_2(callid, (ipcarg_t) result,
+                        ipc_answer_2(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer));
                         break;
                 case 3:
-                        ipc_answer_3(callid, (ipcarg_t) result,
+                        ipc_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, (ipcarg_t) result,
+                        ipc_answer_4(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer));
@@ -89 +89 @@
                 case 5:
                 default:
-                        ipc_answer_5(callid, (ipcarg_t) result,
+                        ipc_answer_5(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer),
@@ -111 +111 @@
  *                      function.
  */
-int bind_service(services_t need, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3,
+int bind_service(services_t need, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
     async_client_conn_t client_receiver)
 {
@@ -134 +134 @@
  *
  */
-int bind_service_timeout(services_t need, ipcarg_t arg1, ipcarg_t arg2,
-    ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
+int bind_service_timeout(services_t need, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
         int rc;
@@ -143 +143 @@
         if (phone >= 0) {
                 /* Request the bidirectional connection */
-                ipcarg_t phonehash;
+                sysarg_t phonehash;
                 
                 rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
@@ -196 +196 @@
                 timeout -= MODULE_WAIT_TIME;
         }
-}
-
-/** Receives data from the other party.
- *
- * The received data buffer is allocated and returned.
- *
- * @param[out] data     The data buffer to be filled.
- * @param[out] length   The buffer length.
- * @return              EOK on success.
- * @return              EBADMEM if the data or the length parameter is NULL.
- * @return              EINVAL if the client does not send data.
- * @return              ENOMEM if there is not enough memory left.
- * @return              Other error codes as defined for the
- *                      async_data_write_finalize() function.
- */
-int data_receive(void **data, size_t *length)
-{
-        ipc_callid_t callid;
-        int rc;
-
-        if (!data || !length)
-                return EBADMEM;
-
-        // fetch the request
-        if (!async_data_write_receive(&callid, length))
-                return EINVAL;
-
-        // allocate the buffer
-        *data = malloc(*length);
-        if (!*data)
-                return ENOMEM;
-
-        // fetch the data
-        rc = async_data_write_finalize(callid, *data, *length);
-        if (rc != EOK) {
-                free(data);
-                return rc;
-        }
-
-        return EOK;
 }
 
@@ -283 +243 @@
                 IPC_SET_RETVAL(*answer, 0);
                 // just to be precize
-                IPC_SET_METHOD(*answer, 0);
+                IPC_SET_IMETHOD(*answer, 0);
                 IPC_SET_ARG1(*answer, 0);
                 IPC_SET_ARG2(*answer, 0);