Changeset 05ffb41 in mainline for kernel/generic/src/ipc/ops/connclone.c

Timestamp:

2017-08-17T19:11:14Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1c85bae

Parents:

7e3826d9

Message:

Turn IPC phones into kobjects

File:

• kernel/generic/src/ipc/ops/connclone.c (modified) (4 diffs)

kernel/generic/src/ipc/ops/connclone.c

@@ -61 +61 @@
 static int request_preprocess(call_t *call, phone_t *phone)
 {
-        phone_t *cloned_phone;
-
-        if (phone_get(IPC_GET_ARG1(call->data), &cloned_phone) != EOK)
+        phone_t *cloned_phone = phone_get_current(IPC_GET_ARG1(call->data));
+        if (!cloned_phone)
                 return ENOENT;
-                
+        
         phones_lock(cloned_phone, phone);
-                
+        
         if ((cloned_phone->state != IPC_PHONE_CONNECTED) ||
             phone->state != IPC_PHONE_CONNECTED) {
@@ -73 +72 @@
                 return EINVAL;
         }
-                
+        
         /*
          * We can be pretty sure now that both tasks exist and we are
@@ -81 +80 @@
          *
          */
-        int newphid = phone_alloc(phone->callee->task);
-        if (newphid < 0) {
+        int cap = phone_alloc(phone->callee->task);
+        if (cap < 0) {
                 phones_unlock(cloned_phone, phone);
                 return ELIMIT;
         }
-                
-        (void) ipc_phone_connect(&phone->callee->task->phones[newphid],
+        
+        (void) ipc_phone_connect(phone_get(phone->callee->task, cap),
             cloned_phone->callee);
         phones_unlock(cloned_phone, phone);
-                
+        
         /* Set the new phone for the callee. */
-        IPC_SET_ARG1(call->data, newphid);
+        IPC_SET_ARG1(call->data, cap);
 
         return EOK;
@@ -99 +98 @@
 static int answer_cleanup(call_t *answer, ipc_data_t *olddata)
 {
-        int phoneid = (int) IPC_GET_ARG1(*olddata);
-        phone_t *phone = &TASK->phones[phoneid];
+        int cap = (int) IPC_GET_ARG1(*olddata);
+        phone_t *phone = phone_get_current(cap);
 
         /*