Changes in kernel/generic/src/ipc/sysipc.c [ab34cc9:79ae36dd] in mainline

File:

• kernel/generic/src/ipc/sysipc.c (modified) (8 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -40 +40 @@
 #include <debug.h>
 #include <ipc/ipc.h>
-#include <abi/ipc/methods.h>
+#include <ipc/ipc_methods.h>
 #include <ipc/sysipc.h>
 #include <ipc/irq.h>
 #include <ipc/ipcrsc.h>
-#include <ipc/event.h>
 #include <ipc/kbox.h>
 #include <synch/waitq.h>
@@ -54 +53 @@
 #include <mm/as.h>
 #include <print.h>
-#include <macros.h>
 
 /**
@@ -136 +134 @@
         case IPC_M_DATA_WRITE:
         case IPC_M_DATA_READ:
-        case IPC_M_STATE_CHANGE_AUTHORIZE:
                 return true;
         default:
@@ -167 +164 @@
         case IPC_M_DATA_WRITE:
         case IPC_M_DATA_READ:
-        case IPC_M_STATE_CHANGE_AUTHORIZE:
                 return true;
         default:
@@ -253 +249 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
+                        /* Set 'task hash' as arg4 of response */
+                        IPC_SET_ARG4(answer->data, (sysarg_t) TASK);
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,
@@ -336 +334 @@
                 free(answer->buffer);
                 answer->buffer = NULL;
-        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_STATE_CHANGE_AUTHORIZE) {
-                if (!IPC_GET_RETVAL(answer->data)) {
-                        /* The recipient authorized the change of state. */
-                        phone_t *recipient_phone;
-                        task_t *other_task_s;
-                        task_t *other_task_r;
-                        int rc;
-
-                        rc = phone_get(IPC_GET_ARG1(answer->data),
-                            &recipient_phone);
-                        if (rc != EOK) {
-                                IPC_SET_RETVAL(answer->data, ENOENT);
-                                return ENOENT;
-                        }
-
-                        mutex_lock(&recipient_phone->lock);
-                        if (recipient_phone->state != IPC_PHONE_CONNECTED) {
-                                mutex_unlock(&recipient_phone->lock);
-                                IPC_SET_RETVAL(answer->data, EINVAL);
-                                return EINVAL;
-                        }
-
-                        other_task_r = recipient_phone->callee->task;
-                        other_task_s = (task_t *) IPC_GET_ARG5(*olddata);
-
-                        /*
-                         * See if both the sender and the recipient meant the
-                         * same third party task.
-                         */
-                        if (other_task_r != other_task_s) {
-                                IPC_SET_RETVAL(answer->data, EINVAL);
-                                rc = EINVAL;
-                        } else {
-                                rc = event_task_notify_5(other_task_r,
-                                    EVENT_TASK_STATE_CHANGE, false,
-                                    IPC_GET_ARG1(*olddata),
-                                    IPC_GET_ARG2(*olddata),
-                                    IPC_GET_ARG3(*olddata),
-                                    LOWER32(olddata->task_id),
-                                    UPPER32(olddata->task_id));
-                                IPC_SET_RETVAL(answer->data, rc);
-                        }
-
-                        mutex_unlock(&recipient_phone->lock);
-                        return rc;
-                }
         }
         
@@ -475 +427 @@
         case IPC_M_DATA_READ: {
                 size_t size = IPC_GET_ARG2(call->data);
+                if (size <= 0)
+                        return ELIMIT;
                 if (size > DATA_XFER_LIMIT) {
                         int flags = IPC_GET_ARG3(call->data);
@@ -504 +458 @@
                 }
                 
-                break;
-        }
-        case IPC_M_STATE_CHANGE_AUTHORIZE: {
-                phone_t *sender_phone;
-                task_t *other_task_s;
-
-                if (phone_get(IPC_GET_ARG5(call->data), &sender_phone) != EOK)
-                        return ENOENT;
-
-                mutex_lock(&sender_phone->lock);
-                if (sender_phone->state != IPC_PHONE_CONNECTED) {
-                        mutex_unlock(&sender_phone->lock);
-                        return EINVAL;
-                }
-
-                other_task_s = sender_phone->callee->task;
-
-                mutex_unlock(&sender_phone->lock);
-
-                /* Remember the third party task hash. */
-                IPC_SET_ARG5(call->data, (sysarg_t) other_task_s);
                 break;
         }