Changeset 503ffce in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2017-11-23T23:52:59Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f571ca49

Parents:

b1f36e3

Message:

Return IPC_CALLID_* in call data instead of callid

Callid will be replaced by capability handles soon so the API needs
to be cleanup up and any flags passed together with callid must be
passed using some other way.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -728 +728 @@
  *
  * @return Hash of the call.
- *         If IPC_CALLID_NOTIFICATION bit is set in the hash, the
- *         call is a notification. IPC_CALLID_ANSWERED denotes an
- *         answer.
- *
  */
 sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
@@ -758 +754 @@
                 call->data.phone = (void *) call->priv;
                 
+                call->data.flags = IPC_CALLID_NOTIFICATION;
+
                 STRUCT_TO_USPACE(calldata, &call->data);
-                
                 kobject_put(call->kobject);
                 
-                return ((sysarg_t) call) | IPC_CALLID_NOTIFICATION;
+                return (sysarg_t) call;
         }
         
@@ -772 +769 @@
                         goto restart;
                 }
+
+                call->data.flags = IPC_CALLID_ANSWERED;
                 
                 STRUCT_TO_USPACE(calldata, &call->data);
                 kobject_put(call->kobject);
                 
-                return ((sysarg_t) call) | IPC_CALLID_ANSWERED;
+                return (sysarg_t) call;
         }