Changeset 0722869 in mainline for uspace

Timestamp:

2017-12-09T18:21:29Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

bd253241

Parents:

071a1ddb (diff), 0016674 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-09 18:21:29)

git-committer:

GitHub <noreply@…> (2017-12-09 18:21:29)

Message:

Merge SYS_IPC_CONNECT_KBOX changes.

Return phone handle in SYS_IPC_CONNECT_KBOX separately from error code, don't leak phone on failure, and remove the unnecessary separation into two versions.

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (1 diff)
• generic/ipc.c (modified) (1 diff)
• include/ipc/ipc.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -2398 +2398 @@
         }
         
-        int phone = ipc_connect_kbox(id);
-        if (phone < 0) {
-                errno = phone;
+        cap_handle_t phone;
+        int rc = ipc_connect_kbox(id, &phone);
+        if (rc != EOK) {
+                errno = rc;
                 free(sess);
                 return NULL;

uspace/lib/c/generic/ipc.c

@@ -377 +377 @@
  *
  */
-int ipc_connect_kbox(task_id_t id)
-{
-#ifdef __32_BITS__
-        sysarg64_t arg = (sysarg64_t) id;
-        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg);
-#endif
-        
-#ifdef __64_BITS__
-        return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) id);
-#endif
+int ipc_connect_kbox(task_id_t id, cap_handle_t *phone)
+{
+        return __SYSCALL2(SYS_IPC_CONNECT_KBOX, (sysarg_t) &id, (sysarg_t) phone);
 }
 

uspace/lib/c/include/ipc/ipc.h

@@ -122 +122 @@
     sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
 
-extern int ipc_connect_kbox(task_id_t);
+extern int ipc_connect_kbox(task_id_t, cap_handle_t *);
 
 #endif