Changeset 7cfe5c0 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2012-08-20T19:16:24Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

6b99156

Parents:

b9cb911 (diff), 01e397ac (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:

Merged with mainline 0.5.0 changes.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)

kernel/generic/src/ipc/sysipc.c

@@ -612 +612 @@
                 break;
         }
-        
-        return 0;
-}
-
-/** Make a fast call over IPC, wait for reply and return to user.
- *
- * This function can handle only three arguments of payload, but is faster than
- * the generic function (i.e. sys_ipc_call_sync_slow()).
- *
- * @param phoneid Phone handle for the call.
- * @param imethod Interface and method of the call.
- * @param arg1    Service-defined payload argument.
- * @param arg2    Service-defined payload argument.
- * @param arg3    Service-defined payload argument.
- * @param data    Address of user-space structure where the reply call will
- *                be stored.
- *
- * @return 0 on success.
- * @return ENOENT if there is no such phone handle.
- *
- */
-sysarg_t sys_ipc_call_sync_fast(sysarg_t phoneid, sysarg_t imethod,
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_data_t *data)
-{
-        phone_t *phone;
-        if (phone_get(phoneid, &phone) != EOK)
-                return ENOENT;
-        
-        call_t *call = ipc_call_alloc(0);
-        IPC_SET_IMETHOD(call->data, imethod);
-        IPC_SET_ARG1(call->data, arg1);
-        IPC_SET_ARG2(call->data, arg2);
-        IPC_SET_ARG3(call->data, arg3);
-        
-        /*
-         * To achieve deterministic behavior, zero out arguments that are beyond
-         * the limits of the fast version.
-         */
-        IPC_SET_ARG4(call->data, 0);
-        IPC_SET_ARG5(call->data, 0);
-        
-        int res = request_preprocess(call, phone);
-        int rc;
-        
-        if (!res) {
-#ifdef CONFIG_UDEBUG
-                udebug_stoppable_begin();
-#endif
-                rc = ipc_call_sync(phone, call);
-#ifdef CONFIG_UDEBUG
-                udebug_stoppable_end();
-#endif
-                
-                if (rc != EOK) {
-                        /* The call will be freed by ipc_cleanup(). */
-                        return rc;
-                }
-                
-                process_answer(call);
-        } else
-                IPC_SET_RETVAL(call->data, res);
-        
-        rc = STRUCT_TO_USPACE(&data->args, &call->data.args);
-        ipc_call_free(call);
-        if (rc != 0)
-                return rc;
-        
-        return 0;
-}
-
-/** Make a synchronous IPC call allowing to transmit the entire payload.
- *
- * @param phoneid Phone handle for the call.
- * @param request User-space address of call data with the request.
- * @param reply   User-space address of call data where to store the
- *                answer.
- *
- * @return Zero on success or an error code.
- *
- */
-sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *request,
-    ipc_data_t *reply)
-{
-        phone_t *phone;
-        if (phone_get(phoneid, &phone) != EOK)
-                return ENOENT;
-        
-        call_t *call = ipc_call_alloc(0);
-        int rc = copy_from_uspace(&call->data.args, &request->args,
-            sizeof(call->data.args));
-        if (rc != 0) {
-                ipc_call_free(call);
-                return (sysarg_t) rc;
-        }
-        
-        int res = request_preprocess(call, phone);
-        
-        if (!res) {
-#ifdef CONFIG_UDEBUG
-                udebug_stoppable_begin();
-#endif
-                rc = ipc_call_sync(phone, call);
-#ifdef CONFIG_UDEBUG
-                udebug_stoppable_end();
-#endif
-                
-                if (rc != EOK) {
-                        /* The call will be freed by ipc_cleanup(). */
-                        return rc;
-                }
-                
-                process_answer(call);
-        } else
-                IPC_SET_RETVAL(call->data, res);
-        
-        rc = STRUCT_TO_USPACE(&reply->args, &call->data.args);
-        ipc_call_free(call);
-        if (rc != 0)
-                return rc;
         
         return 0;