Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 4ff66ae57af053109c34f24cd433ec080d97444c) +++ uspace/lib/c/Makefile (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -167,4 +167,5 @@ generic/stats.c \ generic/taskman.c \ + generic/taskman_noasync.c \ generic/assert.c \ generic/bsearch.c \ Index: uspace/lib/c/generic/async/client.c =================================================================== --- uspace/lib/c/generic/async/client.c (revision 4ff66ae57af053109c34f24cd433ec080d97444c) +++ uspace/lib/c/generic/async/client.c (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -198,4 +198,8 @@ } +int async_session_phone(async_sess_t *sess) +{ + return sess->phone; +} /** Initialize the async framework. Index: uspace/lib/c/generic/private/async.h =================================================================== --- uspace/lib/c/generic/private/async.h (revision 4ff66ae57af053109c34f24cd433ec080d97444c) +++ uspace/lib/c/generic/private/async.h (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -108,4 +108,5 @@ extern async_sess_t *create_session(int, exch_mgmt_t, sysarg_t, sysarg_t, sysarg_t); +extern int async_session_phone(async_sess_t *); #endif Index: uspace/lib/c/generic/taskman_noasync.c =================================================================== --- uspace/lib/c/generic/taskman_noasync.c (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) +++ uspace/lib/c/generic/taskman_noasync.c (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -0,0 +1,80 @@ +/* + * 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 + */ + +#define LIBC_ASYNC_C_ +#include +#include "private/async.h" +#include "private/taskman.h" +#undef LIBC_ASYNC_C_ + +#include +#include +#include + + + + +/** Tell taskman we are his NS + * + * @return EOK on success, otherwise propagated error code + */ +int taskman_intro_ns_noasync(void) +{ + assert(session_taskman); + int phone = async_session_phone(session_taskman); + + ipc_call_async_0(phone, TASKMAN_I_AM_NS, NULL, NULL, false); + + ipc_call_async_3(phone, IPC_M_CONNECT_TO_ME, 0, 0, 0, NULL, NULL, false); + + /* + * 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(int retval) +{ + assert(session_taskman); + int 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, NULL, false); +} + +/** @} + */ Index: uspace/lib/c/include/task.h =================================================================== --- uspace/lib/c/include/task.h (revision 4ff66ae57af053109c34f24cd433ec080d97444c) +++ uspace/lib/c/include/task.h (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -39,5 +39,4 @@ #include #include -#include #include @@ -77,5 +76,5 @@ /* Implemented in task_event.c */ -extern int task_register_event_handler(task_event_handler_t); +extern int task_register_event_handler(task_event_handler_t, bool); #endif Index: uspace/lib/c/include/taskman.h =================================================================== --- uspace/lib/c/include/taskman.h (revision 4ff66ae57af053109c34f24cd433ec080d97444c) +++ uspace/lib/c/include/taskman.h (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -36,12 +36,8 @@ #define LIBC_TASKMAN_H_ -#ifndef TASKMAN_DISABLE_ASYNC #include -#endif /* Internal functions to be used by loader only */ -#ifndef TASKMAN_DISABLE_ASYNC extern async_sess_t *taskman_get_session(void); -#endif extern int taskman_intro_loader(void); Index: uspace/lib/c/include/taskman_noasync.h =================================================================== --- uspace/lib/c/include/taskman_noasync.h (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) +++ uspace/lib/c/include/taskman_noasync.h (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -0,0 +1,47 @@ +/* + * 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 int taskman_intro_ns_noasync(void); + +extern void task_retval_noasync(int); + +#endif + +/** @} + */ Index: uspace/lib/c/include/types/task.h =================================================================== --- uspace/lib/c/include/types/task.h (revision 4ff66ae57af053109c34f24cd433ec080d97444c) +++ uspace/lib/c/include/types/task.h (revision ff20afc254a972d459b19912fcc810d00dcb8b6b) @@ -36,4 +36,6 @@ #define _LIBC_TYPES_TASK_H_ +#include + typedef enum { TASK_EXIT_RUNNING, /**< Internal taskman value. */