Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision ae004bcbbd3ddab783faa0124f9c8981387c4cd1) +++ uspace/lib/c/Makefile (revision 34e91bfb661158f77b3ba1c0edc4506a089e4f49) @@ -167,5 +167,4 @@ generic/stats.c \ generic/taskman.c \ - generic/taskman_noasync.c \ generic/assert.c \ generic/bsearch.c \ Index: pace/lib/c/generic/taskman_noasync.c =================================================================== --- uspace/lib/c/generic/taskman_noasync.c (revision ae004bcbbd3ddab783faa0124f9c8981387c4cd1) +++ (revision ) @@ -1,76 +1,0 @@ -/* - * Copyright (c) 2015 Michal Koutny - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#include "private/async.h" -#include "private/taskman.h" - -#undef _LIBC_ASYNC_H_ -#include -#define _LIBC_ASYNC_H_ - -#include -#include -#include - -/** Tell taskman we are his NS - * - * @return EOK on success, otherwise propagated error code - */ -errno_t taskman_intro_ns_noasync(void) -{ - assert(session_taskman); - cap_phone_handle_t phone = async_session_phone(session_taskman); - - ipc_call_async_0(phone, TASKMAN_I_AM_NS, NULL); - - ipc_call_async_3(phone, IPC_M_CONNECT_TO_ME, 0, 0, 0, NULL); - - /* - * Since this is a workaround for NS's low-level implementation, we can - * assume positive answer and return EOK. - */ - return EOK; -} - -void task_retval_noasync(errno_t retval) -{ - assert(session_taskman); - cap_phone_handle_t phone = async_session_phone(session_taskman); - - /* Just send it and don't wait for an answer. */ - ipc_call_async_2(phone, TASKMAN_RETVAL, retval, false, NULL); -} - -/** @} - */ Index: pace/lib/c/include/taskman_noasync.h =================================================================== --- uspace/lib/c/include/taskman_noasync.h (revision ae004bcbbd3ddab783faa0124f9c8981387c4cd1) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2015 Michal Koutny - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_TASKMAN_NOASYNC_H_ -#define LIBC_TASKMAN_NOASYNC_H_ - -/* Internal functions to be used by NS only */ -extern errno_t taskman_intro_ns_noasync(void); - -extern void task_retval_noasync(int); - -#endif - -/** @} - */ Index: uspace/srv/ns/ns.c =================================================================== --- uspace/srv/ns/ns.c (revision ae004bcbbd3ddab783faa0124f9c8981387c4cd1) +++ uspace/srv/ns/ns.c (revision 34e91bfb661158f77b3ba1c0edc4506a089e4f49) @@ -45,5 +45,6 @@ #include #include -#include +#include +#include #include "ns.h" @@ -119,10 +120,10 @@ return rc; - rc = taskman_intro_ns_noasync(); + rc = taskman_intro_ns(); if (rc != EOK) { printf("%s: not accepted by taskman (%i)\n", NAME, rc); return rc; } - task_retval_noasync(0); + task_retval(0); async_set_fallback_port_handler(ns_connection, NULL);