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

Timestamp:

2017-08-17T19:11:14Z (7 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/sysipc.c (modified) (9 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -264 +264 @@
 /** Make a call over IPC and wait for reply.
  *
- * @param phoneid     Phone handle for the call.
- * @param data[inout] Structure with request/reply data.
- * @param priv        Value to be stored in call->priv.
+ * @param phone_cap    Phone capability for the call.
+ * @param data[inout]  Structure with request/reply data.
+ * @param priv         Value to be stored in call->priv.
  *
  * @return EOK on success.
@@ -272 +272 @@
  *
  */
-int ipc_req_internal(int phoneid, ipc_data_t *data, sysarg_t priv)
-{
-        phone_t *phone;
-        if (phone_get(phoneid, &phone) != EOK)
+int ipc_req_internal(int phone_cap, ipc_data_t *data, sysarg_t priv)
+{
+        phone_t *phone = phone_get_current(phone_cap);
+        if (!phone)
                 return ENOENT;
         
@@ -350 +350 @@
  * the generic function sys_ipc_call_async_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 arg4    Service-defined payload argument.
+ * @param phone_cap  Phone capability 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 arg4       Service-defined payload argument.
  *
  * @return Call hash on success.
@@ -363 +363 @@
  *
  */
-sysarg_t sys_ipc_call_async_fast(sysarg_t phoneid, sysarg_t imethod,
+sysarg_t sys_ipc_call_async_fast(sysarg_t phone_cap, sysarg_t imethod,
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
-        phone_t *phone;
-        if (phone_get(phoneid, &phone) != EOK)
+        phone_t *phone = phone_get_current(phone_cap);
+        if (!phone)
                 return IPC_CALLRET_FATAL;
         
@@ -398 +398 @@
 /** Make an asynchronous IPC call allowing to transmit the entire payload.
  *
- * @param phoneid Phone handle for the call.
- * @param data    Userspace address of call data with the request.
+ * @param phone_cap  Phone capability for the call.
+ * @param data       Userspace address of call data with the request.
  *
  * @return See sys_ipc_call_async_fast().
  *
  */
-sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data)
-{
-        phone_t *phone;
-        if (phone_get(phoneid, &phone) != EOK)
+sysarg_t sys_ipc_call_async_slow(sysarg_t phone_cap, ipc_data_t *data)
+{
+        phone_t *phone = phone_get_current(phone_cap);
+        if (!phone)
                 return IPC_CALLRET_FATAL;
 
@@ -435 +435 @@
  * Common code for both the fast and the slow version.
  *
- * @param callid  Hash of the call to forward.
- * @param phoneid Phone handle to use for forwarding.
- * @param imethod New interface and method to use for the forwarded call.
- * @param arg1    New value of the first argument for the forwarded call.
- * @param arg2    New value of the second argument for the forwarded call.
- * @param arg3    New value of the third argument for the forwarded call.
- * @param arg4    New value of the fourth argument for the forwarded call.
- * @param arg5    New value of the fifth argument for the forwarded call.
- * @param mode    Flags that specify mode of the forward operation.
- * @param slow    If true, arg3, arg4 and arg5 are considered. Otherwise
- *                the function considers only the fast version arguments:
- *                i.e. arg1 and arg2.
+ * @param callid     Hash of the call to forward.
+ * @param phone_cap  Phone capability to use for forwarding.
+ * @param imethod    New interface and method to use for the forwarded call.
+ * @param arg1       New value of the first argument for the forwarded call.
+ * @param arg2       New value of the second argument for the forwarded call.
+ * @param arg3       New value of the third argument for the forwarded call.
+ * @param arg4       New value of the fourth argument for the forwarded call.
+ * @param arg5       New value of the fifth argument for the forwarded call.
+ * @param mode       Flags that specify mode of the forward operation.
+ * @param slow       If true, arg3, arg4 and arg5 are considered. Otherwise
+ *                   the function considers only the fast version arguments:
+ *                   i.e. arg1 and arg2.
  *
  * @return 0 on succes, otherwise an error code.
@@ -453 +453 @@
  *
  */
-static sysarg_t sys_ipc_forward_common(sysarg_t callid, sysarg_t phoneid,
+static sysarg_t sys_ipc_forward_common(sysarg_t callid, sysarg_t phone_cap,
     sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
     sysarg_t arg4, sysarg_t arg5, unsigned int mode, bool slow)
@@ -468 +468 @@
         bool after_forward = false;
         int rc;
-        phone_t *phone;
-        
-        if (phone_get(phoneid, &phone) != EOK) {
+
+        phone_t *phone = phone_get_current(phone_cap);
+        if (!phone) {
                 rc = ENOENT;
                 goto error;
@@ -685 +685 @@
 /** Hang up a phone.
  *
- * @param Phone handle of the phone to be hung up.
+ * @param phone_cap  Phone capability of the phone to be hung up.
  *
  * @return 0 on success or an error code.
  *
  */
-sysarg_t sys_ipc_hangup(sysarg_t phoneid)
-{
-        phone_t *phone;
-        
-        if (phone_get(phoneid, &phone) != EOK)
+sysarg_t sys_ipc_hangup(sysarg_t phone_cap)
+{
+        phone_t *phone = phone_get_current(phone_cap);
+        if (!phone)
                 return ENOENT;