Index: uspace/app/display-cfg/main.c =================================================================== --- uspace/app/display-cfg/main.c (revision cdf53614e69dd176ed18ae75864449fefe9d5816) +++ uspace/app/display-cfg/main.c (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2023 Jiri Svoboda + * 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 display-cfg + * @{ + */ +/** @file Display configuration utility (UI) main + */ + +#include +#include +#include +#include "display-cfg.h" + +static void print_syntax(void) +{ + printf("Syntax: display-cfg [-d ]\n"); +} + +int main(int argc, char *argv[]) +{ + const char *display_spec = UI_ANY_DEFAULT; + display_cfg_t *dcfg; + errno_t rc; + int i; + + i = 1; + while (i < argc && argv[i][0] == '-') { + if (str_cmp(argv[i], "-d") == 0) { + ++i; + if (i >= argc) { + printf("Argument missing.\n"); + print_syntax(); + return 1; + } + + display_spec = argv[i++]; + } else { + printf("Invalid option '%s'.\n", argv[i]); + print_syntax(); + return 1; + } + } + + if (i < argc) { + print_syntax(); + return 1; + } + + rc = display_cfg_create(display_spec, &dcfg); + if (rc != EOK) + return 1; + + ui_run(dcfg->ui); + display_cfg_destroy(dcfg); + + return 0; +} + +/** @} + */ Index: uspace/app/display-cfg/test/seats.c =================================================================== --- uspace/app/display-cfg/test/seats.c (revision 97d3d9db4f40fc7312c2c51cdda6595ccc6210a4) +++ uspace/app/display-cfg/test/seats.c (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -27,6 +27,10 @@ */ +#include +#include +#include #include #include +#include #include "../display-cfg.h" #include "../seats.h" @@ -35,4 +39,7 @@ PCUT_TEST_SUITE(seats); + +static const char *test_dispcfg_server = "test-dispcfg"; +static const char *test_dispcfg_svc = "test/dispcfg"; /** Test dcfg_seats_create() and dcfg_seats_destroy() */ @@ -81,4 +88,25 @@ PCUT_TEST(seats_list_populate) { + errno_t rc; + service_id_t sid; + dispcfg_t *dispcfg = NULL; + test_response_t resp; + + async_set_fallback_port_handler(test_dispcfg_conn, &resp); + + // FIXME This causes this test to be non-reentrant! + rc = loc_server_register(test_dispcfg_server); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = loc_service_register(test_dispcfg_svc, &sid); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + + rc = dispcfg_open(test_dispcfg_svc, NULL, NULL, &dispcfg); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); + PCUT_ASSERT_NOT_NULL(dispcfg); + + dispcfg_close(dispcfg); + rc = loc_service_unregister(sid); + PCUT_ASSERT_ERRNO_VAL(EOK, rc); } Index: uspace/lib/dispcfg/include/dispcfg.h =================================================================== --- uspace/lib/dispcfg/include/dispcfg.h (revision 97d3d9db4f40fc7312c2c51cdda6595ccc6210a4) +++ uspace/lib/dispcfg/include/dispcfg.h (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -27,5 +27,5 @@ */ -/** @addtogroup libwndmgt +/** @addtogroup libdispcfg * @{ */ Index: uspace/lib/dispcfg/include/testdc.h =================================================================== --- uspace/lib/dispcfg/include/testdc.h (revision cdf53614e69dd176ed18ae75864449fefe9d5816) +++ uspace/lib/dispcfg/include/testdc.h (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2023 Jiri Svoboda + * 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 libdispcfg + * @{ + */ +/** @file + */ + +#ifndef _LIBDISPCFG_TESTDC_H_ +#define _LIBDISPCFG_TESTDC_H_ + +#include +#include "types/testdc.h" + +extern dispcfg_cb_t test_dispcfg_cb; + +extern void test_dispcfg_conn(ipc_call_t *, void *); + +#endif + +/** @} + */ Index: uspace/lib/dispcfg/include/types/dispcfg.h =================================================================== --- uspace/lib/dispcfg/include/types/dispcfg.h (revision 97d3d9db4f40fc7312c2c51cdda6595ccc6210a4) +++ uspace/lib/dispcfg/include/types/dispcfg.h (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -30,5 +30,5 @@ * @{ */ -/** @file +/** @file Display configuration protocol types */ Index: uspace/lib/dispcfg/include/types/testdc.h =================================================================== --- uspace/lib/dispcfg/include/types/testdc.h (revision cdf53614e69dd176ed18ae75864449fefe9d5816) +++ uspace/lib/dispcfg/include/types/testdc.h (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2023 Jiri Svoboda + * 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 libdispcfg + * @{ + */ +/** @file Display configuration test service types + */ + +#ifndef _LIBDISPCFG_TYPES_TESTDC_H_ +#define _LIBDISPCFG_TYPES_TESTDC_H_ + +#include +#include +#include +#include +#include + +/** Describes to the server how to respond to our request and pass tracking + * data back to the client. + */ +typedef struct { + errno_t rc; + sysarg_t seat_id; + dispcfg_ev_t event; + dispcfg_ev_t revent; + int event_cnt; + + bool get_seat_list_called; + dispcfg_seat_list_t *get_seat_list_rlist; + + bool get_seat_info_called; + sysarg_t get_seat_info_seat_id; + dispcfg_seat_info_t *get_seat_info_rinfo; + + bool seat_create_called; + char *seat_create_name; + sysarg_t seat_create_seat_id; + + bool seat_delete_called; + sysarg_t seat_delete_seat_id; + + bool dev_assign_called; + sysarg_t dev_assign_svc_id; + sysarg_t dev_assign_seat_id; + + bool dev_unassign_called; + sysarg_t dev_unassign_svc_id; + + bool get_asgn_dev_list_called; + sysarg_t get_asgn_dev_list_seat_id; + dispcfg_dev_list_t *get_asgn_dev_list_rlist; + + bool get_event_called; + + bool seat_added_called; + sysarg_t seat_added_seat_id; + + bool seat_removed_called; + sysarg_t seat_removed_seat_id; + + bool seat_changed_called; + sysarg_t seat_changed_seat_id; + + fibril_condvar_t event_cv; + fibril_mutex_t event_lock; + dispcfg_srv_t *srv; +} test_response_t; + +#endif + +/** @} + */ Index: uspace/lib/dispcfg/meson.build =================================================================== --- uspace/lib/dispcfg/meson.build (revision 97d3d9db4f40fc7312c2c51cdda6595ccc6210a4) +++ uspace/lib/dispcfg/meson.build (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -30,8 +30,9 @@ 'src/dispcfg.c', 'src/dispcfg_srv.c', + 'src/testdc.c' ) test_src = files( 'test/main.c', - 'test/dispcfg.c', + 'test/dispcfg.c' ) Index: uspace/lib/dispcfg/src/testdc.c =================================================================== --- uspace/lib/dispcfg/src/testdc.c (revision cdf53614e69dd176ed18ae75864449fefe9d5816) +++ uspace/lib/dispcfg/src/testdc.c (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2023 Jiri Svoboda + * 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 libdispcfg + * @{ + */ +/** + * @file + * @brief Display configuration test service + */ + +#include +#include +#include +#include +#include +#include + +static errno_t test_get_seat_list(void *, dispcfg_seat_list_t **); +static errno_t test_get_seat_info(void *, sysarg_t, dispcfg_seat_info_t **); +static errno_t test_seat_create(void *, const char *, sysarg_t *); +static errno_t test_seat_delete(void *, sysarg_t); +static errno_t test_dev_assign(void *, sysarg_t, sysarg_t); +static errno_t test_dev_unassign(void *, sysarg_t); +static errno_t test_get_asgn_dev_list(void *, sysarg_t, dispcfg_dev_list_t **); +static errno_t test_get_event(void *, dispcfg_ev_t *); + +static void test_seat_added(void *, sysarg_t); +static void test_seat_removed(void *, sysarg_t); + +static dispcfg_ops_t test_dispcfg_srv_ops = { + .get_seat_list = test_get_seat_list, + .get_seat_info = test_get_seat_info, + .seat_create = test_seat_create, + .seat_delete = test_seat_delete, + .dev_assign = test_dev_assign, + .dev_unassign = test_dev_unassign, + .get_asgn_dev_list = test_get_asgn_dev_list, + .get_event = test_get_event +}; + +dispcfg_cb_t test_dispcfg_cb = { + .seat_added = test_seat_added, + .seat_removed = test_seat_removed +}; + +/** Test seat management service connection. */ +void test_dispcfg_conn(ipc_call_t *icall, void *arg) +{ + test_response_t *resp = (test_response_t *) arg; + dispcfg_srv_t srv; + + /* Set up protocol structure */ + dispcfg_srv_initialize(&srv); + srv.ops = &test_dispcfg_srv_ops; + srv.arg = arg; + resp->srv = &srv; + + /* Handle connection */ + dispcfg_conn(icall, &srv); + + resp->srv = NULL; +} + +static void test_seat_added(void *arg, sysarg_t seat_id) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->revent.etype = dcev_seat_added; + + fibril_mutex_lock(&resp->event_lock); + resp->seat_added_called = true; + resp->seat_added_seat_id = seat_id; + fibril_condvar_broadcast(&resp->event_cv); + fibril_mutex_unlock(&resp->event_lock); +} + +static void test_seat_removed(void *arg, sysarg_t seat_id) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->revent.etype = dcev_seat_removed; + + fibril_mutex_lock(&resp->event_lock); + resp->seat_removed_called = true; + resp->seat_removed_seat_id = seat_id; + fibril_condvar_broadcast(&resp->event_cv); + fibril_mutex_unlock(&resp->event_lock); +} + +static errno_t test_get_seat_list(void *arg, dispcfg_seat_list_t **rlist) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->get_seat_list_called = true; + + if (resp->rc != EOK) + return resp->rc; + + *rlist = resp->get_seat_list_rlist; + return EOK; +} + +static errno_t test_get_seat_info(void *arg, sysarg_t seat_id, + dispcfg_seat_info_t **rinfo) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->get_seat_info_called = true; + resp->get_seat_info_seat_id = seat_id; + + if (resp->rc != EOK) + return resp->rc; + + *rinfo = resp->get_seat_info_rinfo; + return EOK; +} + +static errno_t test_seat_create(void *arg, const char *name, sysarg_t *rseat_id) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->seat_create_called = true; + resp->seat_create_name = str_dup(name); + *rseat_id = resp->seat_create_seat_id; + return resp->rc; +} + +static errno_t test_seat_delete(void *arg, sysarg_t seat_id) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->seat_delete_called = true; + resp->seat_delete_seat_id = seat_id; + return resp->rc; +} + +static errno_t test_dev_assign(void *arg, sysarg_t svc_id, sysarg_t seat_id) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->dev_assign_called = true; + resp->dev_assign_svc_id = svc_id; + resp->dev_assign_seat_id = seat_id; + return resp->rc; +} + +static errno_t test_dev_unassign(void *arg, sysarg_t svc_id) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->dev_unassign_called = true; + resp->dev_unassign_svc_id = svc_id; + return resp->rc; +} + +static errno_t test_get_asgn_dev_list(void *arg, sysarg_t seat_id, + dispcfg_dev_list_t **rlist) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->get_asgn_dev_list_called = true; + resp->get_asgn_dev_list_seat_id = seat_id; + + if (resp->rc != EOK) + return resp->rc; + + *rlist = resp->get_asgn_dev_list_rlist; + return EOK; +} + +static errno_t test_get_event(void *arg, dispcfg_ev_t *event) +{ + test_response_t *resp = (test_response_t *) arg; + + resp->get_event_called = true; + if (resp->event_cnt > 0) { + --resp->event_cnt; + *event = resp->event; + return EOK; + } + + return ENOENT; +} + +/** @} + */ Index: uspace/lib/dispcfg/test/dispcfg.c =================================================================== --- uspace/lib/dispcfg/test/dispcfg.c (revision 97d3d9db4f40fc7312c2c51cdda6595ccc6210a4) +++ uspace/lib/dispcfg/test/dispcfg.c (revision cdf53614e69dd176ed18ae75864449fefe9d5816) @@ -35,4 +35,5 @@ #include #include +#include #include "../private/dispcfg.h" @@ -43,85 +44,4 @@ static const char *test_dispcfg_server = "test-dispcfg"; static const char *test_dispcfg_svc = "test/dispcfg"; - -static void test_dispcfg_conn(ipc_call_t *, void *); - -static errno_t test_get_seat_list(void *, dispcfg_seat_list_t **); -static errno_t test_get_seat_info(void *, sysarg_t, dispcfg_seat_info_t **); -static errno_t test_seat_create(void *, const char *, sysarg_t *); -static errno_t test_seat_delete(void *, sysarg_t); -static errno_t test_dev_assign(void *, sysarg_t, sysarg_t); -static errno_t test_dev_unassign(void *, sysarg_t); -static errno_t test_get_asgn_dev_list(void *, sysarg_t, dispcfg_dev_list_t **); -static errno_t test_get_event(void *, dispcfg_ev_t *); - -static void test_seat_added(void *, sysarg_t); -static void test_seat_removed(void *, sysarg_t); - -static dispcfg_ops_t test_dispcfg_srv_ops = { - .get_seat_list = test_get_seat_list, - .get_seat_info = test_get_seat_info, - .seat_create = test_seat_create, - .seat_delete = test_seat_delete, - .dev_assign = test_dev_assign, - .dev_unassign = test_dev_unassign, - .get_asgn_dev_list = test_get_asgn_dev_list, - .get_event = test_get_event -}; - -static dispcfg_cb_t test_dispcfg_cb = { - .seat_added = test_seat_added, - .seat_removed = test_seat_removed -}; - -/** Describes to the server how to respond to our request and pass tracking - * data back to the client. - */ -typedef struct { - errno_t rc; - sysarg_t seat_id; - dispcfg_ev_t event; - dispcfg_ev_t revent; - int event_cnt; - - bool get_seat_list_called; - dispcfg_seat_list_t *get_seat_list_rlist; - - bool get_seat_info_called; - sysarg_t get_seat_info_seat_id; - dispcfg_seat_info_t *get_seat_info_rinfo; - - bool seat_create_called; - char *seat_create_name; - sysarg_t seat_create_seat_id; - - bool seat_delete_called; - sysarg_t seat_delete_seat_id; - - bool dev_assign_called; - sysarg_t dev_assign_svc_id; - sysarg_t dev_assign_seat_id; - - bool dev_unassign_called; - sysarg_t dev_unassign_svc_id; - - bool get_asgn_dev_list_called; - sysarg_t get_asgn_dev_list_seat_id; - dispcfg_dev_list_t *get_asgn_dev_list_rlist; - - bool get_event_called; - - bool seat_added_called; - sysarg_t seat_added_seat_id; - - bool seat_removed_called; - sysarg_t seat_removed_seat_id; - - bool seat_changed_called; - sysarg_t seat_changed_seat_id; - - fibril_condvar_t event_cv; - fibril_mutex_t event_lock; - dispcfg_srv_t *srv; -} test_response_t; /** dispcfg_open(), dispcfg_close() work for valid seat management service */ @@ -790,142 +710,3 @@ } -/** Test seat management service connection. */ -static void test_dispcfg_conn(ipc_call_t *icall, void *arg) -{ - test_response_t *resp = (test_response_t *) arg; - dispcfg_srv_t srv; - - /* Set up protocol structure */ - dispcfg_srv_initialize(&srv); - srv.ops = &test_dispcfg_srv_ops; - srv.arg = arg; - resp->srv = &srv; - - /* Handle connection */ - dispcfg_conn(icall, &srv); - - resp->srv = NULL; -} - -static void test_seat_added(void *arg, sysarg_t seat_id) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->revent.etype = dcev_seat_added; - - fibril_mutex_lock(&resp->event_lock); - resp->seat_added_called = true; - resp->seat_added_seat_id = seat_id; - fibril_condvar_broadcast(&resp->event_cv); - fibril_mutex_unlock(&resp->event_lock); -} - -static void test_seat_removed(void *arg, sysarg_t seat_id) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->revent.etype = dcev_seat_removed; - - fibril_mutex_lock(&resp->event_lock); - resp->seat_removed_called = true; - resp->seat_removed_seat_id = seat_id; - fibril_condvar_broadcast(&resp->event_cv); - fibril_mutex_unlock(&resp->event_lock); -} - -static errno_t test_get_seat_list(void *arg, dispcfg_seat_list_t **rlist) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->get_seat_list_called = true; - - if (resp->rc != EOK) - return resp->rc; - - *rlist = resp->get_seat_list_rlist; - return EOK; -} - -static errno_t test_get_seat_info(void *arg, sysarg_t seat_id, - dispcfg_seat_info_t **rinfo) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->get_seat_info_called = true; - resp->get_seat_info_seat_id = seat_id; - - if (resp->rc != EOK) - return resp->rc; - - *rinfo = resp->get_seat_info_rinfo; - return EOK; -} - -static errno_t test_seat_create(void *arg, const char *name, sysarg_t *rseat_id) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->seat_create_called = true; - resp->seat_create_name = str_dup(name); - *rseat_id = resp->seat_create_seat_id; - return resp->rc; -} - -static errno_t test_seat_delete(void *arg, sysarg_t seat_id) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->seat_delete_called = true; - resp->seat_delete_seat_id = seat_id; - return resp->rc; -} - -static errno_t test_dev_assign(void *arg, sysarg_t svc_id, sysarg_t seat_id) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->dev_assign_called = true; - resp->dev_assign_svc_id = svc_id; - resp->dev_assign_seat_id = seat_id; - return resp->rc; -} - -static errno_t test_dev_unassign(void *arg, sysarg_t svc_id) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->dev_unassign_called = true; - resp->dev_unassign_svc_id = svc_id; - return resp->rc; -} - -static errno_t test_get_asgn_dev_list(void *arg, sysarg_t seat_id, - dispcfg_dev_list_t **rlist) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->get_asgn_dev_list_called = true; - resp->get_asgn_dev_list_seat_id = seat_id; - - if (resp->rc != EOK) - return resp->rc; - - *rlist = resp->get_asgn_dev_list_rlist; - return EOK; -} - -static errno_t test_get_event(void *arg, dispcfg_ev_t *event) -{ - test_response_t *resp = (test_response_t *) arg; - - resp->get_event_called = true; - if (resp->event_cnt > 0) { - --resp->event_cnt; - *event = resp->event; - return EOK; - } - - return ENOENT; -} - PCUT_EXPORT(dispcfg);