Changes in kernel/generic/src/ipc/sysipc.c [4e5dabf:ab34cc9] in mainline

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -111 +111 @@
         switch (imethod) {
         case IPC_M_CONNECTION_CLONE:
-        case IPC_M_CLONE_ESTABLISH:
+        case IPC_M_CONNECT_ME:
         case IPC_M_PHONE_HUNGUP:
                 /* This message is meant only for the original recipient. */
@@ -160 +160 @@
         switch (IPC_GET_IMETHOD(call->data)) {
         case IPC_M_CONNECTION_CLONE:
-        case IPC_M_CLONE_ESTABLISH:
+        case IPC_M_CONNECT_ME:
         case IPC_M_CONNECT_TO_ME:
         case IPC_M_CONNECT_ME_TO:
@@ -225 +225 @@
                         mutex_unlock(&phone->lock);
                 }
-        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CLONE_ESTABLISH) {
+        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CONNECT_ME) {
                 phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
                 
@@ -271 +271 @@
                         irq_spinlock_unlock(&answer->sender->lock, true);
                         
-                        uintptr_t dst_base = (uintptr_t) -1;
                         int rc = as_area_share(as, IPC_GET_ARG1(*olddata),
-                            IPC_GET_ARG2(*olddata), AS, IPC_GET_ARG3(*olddata),
-                            &dst_base, IPC_GET_ARG1(answer->data));
-                        
-                        if (rc == EOK)
-                                rc = copy_to_uspace((void *) IPC_GET_ARG2(answer->data),
-                                    &dst_base, sizeof(dst_base));
-                        
+                            IPC_GET_ARG2(*olddata), AS,
+                            IPC_GET_ARG1(answer->data), IPC_GET_ARG3(*olddata));
                         IPC_SET_RETVAL(answer->data, rc);
                         return rc;
                 }
         } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_SHARE_IN) {
-                if (!IPC_GET_RETVAL(answer->data)) {
+                if (!IPC_GET_RETVAL(answer->data)) { 
                         irq_spinlock_lock(&answer->sender->lock, true);
                         as_t *as = answer->sender->as;
                         irq_spinlock_unlock(&answer->sender->lock, true);
                         
-                        uintptr_t dst_base = (uintptr_t) -1;
                         int rc = as_area_share(AS, IPC_GET_ARG1(answer->data),
-                            IPC_GET_ARG1(*olddata), as, IPC_GET_ARG2(answer->data),
-                            &dst_base, IPC_GET_ARG3(answer->data));
-                        IPC_SET_ARG4(answer->data, dst_base);
+                            IPC_GET_ARG2(*olddata), as, IPC_GET_ARG1(*olddata),
+                            IPC_GET_ARG2(answer->data));
                         IPC_SET_RETVAL(answer->data, rc);
                 }
@@ -459 +451 @@
                 break;
         }
-        case IPC_M_CLONE_ESTABLISH:
+        case IPC_M_CONNECT_ME:
                 IPC_SET_ARG5(call->data, (sysarg_t) phone);
                 break;
@@ -597 +589 @@
         if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) {
                 int phoneid = phone_alloc(TASK);
-                if (phoneid < 0) {  /* Failed to allocate phone */
+                if (phoneid < 0) { /* Failed to allocate phone */
                         IPC_SET_RETVAL(call->data, ELIMIT);
                         ipc_answer(box, call);
@@ -883 +875 @@
         
         /*
-         * User space is not allowed to change interface and method of system
+         * Userspace is not allowed to change interface and method of system
          * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by
-         * means of imethod, arg1, arg2 and arg3.
+         * means of method, arg1, arg2 and arg3.
          * If the interface and method is immutable, don't change anything.
          */
@@ -897 +889 @@
                         IPC_SET_ARG3(call->data, arg2);
                         
-                        if (slow)
+                        if (slow) {
                                 IPC_SET_ARG4(call->data, arg3);
-                        
-                        /*
-                         * For system methods we deliberately don't
-                         * overwrite ARG5.
-                         */
+                                /*
+                                 * For system methods we deliberately don't
+                                 * overwrite ARG5.
+                                 */
+                        }
                 } else {
                         IPC_SET_IMETHOD(call->data, imethod);
@@ -1193 +1185 @@
  *
  */
-sysarg_t sys_irq_register(inr_t inr, devno_t devno, sysarg_t imethod,
+sysarg_t sys_register_irq(inr_t inr, devno_t devno, sysarg_t imethod,
     irq_code_t *ucode)
 {
@@ -1210 +1202 @@
  *
  */
-sysarg_t sys_irq_unregister(inr_t inr, devno_t devno)
+sysarg_t sys_unregister_irq(inr_t inr, devno_t devno)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))