Changes in kernel/generic/src/ipc/ops/conctmeto.c [334c103:eadaeae8] in mainline

File:

• kernel/generic/src/ipc/ops/conctmeto.c (modified) (5 diffs)

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

@@ -46 +46 @@
          * That will be done once the phone is connected.
          */
-        cap_handle_t phone_handle;
+        cap_phone_handle_t phone_handle;
         kobject_t *phone_obj;
         errno_t rc = phone_alloc(TASK, false, &phone_handle, &phone_obj);
@@ -58 +58 @@
 
         /* Remember the handle */
-        call->priv = phone_handle;
+        call->priv = CAP_HANDLE_RAW(phone_handle);
 
         return EOK;
@@ -65 +65 @@
 static errno_t request_forget(call_t *call)
 {
-        cap_handle_t phone_handle = (cap_handle_t) call->priv;
+        cap_phone_handle_t phone_handle = (cap_handle_t) call->priv;
 
-        if (phone_handle < 0)
+        if (CAP_HANDLE_RAW(phone_handle) < 0)
                 return EOK;
 
@@ -103 +103 @@
 static errno_t answer_process(call_t *answer)
 {
-        cap_handle_t phone_handle = (cap_handle_t) answer->priv;
+        cap_phone_handle_t phone_handle = (cap_handle_t) answer->priv;
         phone_t *phone = (phone_t *) IPC_GET_ARG5(answer->data);
 
         if (IPC_GET_RETVAL(answer->data)) {
-                if (phone_handle >= 0) {
+                if (CAP_HANDLE_RAW(phone_handle) >= 0) {
                         /*
                          * Cleanup the unpublished capability and drop
@@ -123 +123 @@
                 cap_publish(TASK, phone_handle, phone->kobject);
 
-                IPC_SET_ARG5(answer->data, phone_handle);
+                IPC_SET_ARG5(answer->data, CAP_HANDLE_RAW(phone_handle));
         }