Index: uspace/lib/c/generic/io/con_srv.c =================================================================== --- uspace/lib/c/generic/io/con_srv.c (revision 0d57c3e8dc226ff58ff9c31e8727d5319cd44bf5) +++ uspace/lib/c/generic/io/con_srv.c (revision 0d57c3e8dc226ff58ff9c31e8727d5319cd44bf5) @@ -0,0 +1,409 @@ +/* + * Copyright (c) 2012 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 libc + * @{ + */ +/** + * @file + * @brief Console protocol server stub + */ +#include +#include +#include +#include + +#include + +static void con_read_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + void *buf; + size_t size; + int rc; + ipc_callid_t rcallid; + + if (!async_data_read_receive(&rcallid, &size)) { + async_answer_0(callid, EINVAL); + return; + } + + buf = malloc(size); + if (buf == NULL) { + async_answer_0(rcallid, ENOMEM); + async_answer_0(callid, ENOMEM); + return; + } + + if (srv->srvs->ops->read == NULL) { + async_answer_0(rcallid, ENOTSUP); + async_answer_0(callid, ENOTSUP); + return; + } + + rc = srv->srvs->ops->read(srv, buf, size); + if (rc < 0) { + async_answer_0(rcallid, rc); + async_answer_0(callid, rc); + return; + } + + async_data_read_finalize(rcallid, buf, size); + free(buf); + + if (rc >= 0) + async_answer_1(callid, EOK, rc); + else + async_answer_0(callid, rc); +} + +static void con_write_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + void *data; + size_t size; + int rc; + + rc = async_data_write_accept(&data, false, 0, 0, 0, &size); + if (rc != EOK) { + async_answer_0(callid, rc); + return; + } + + if (srv->srvs->ops->write == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + rc = srv->srvs->ops->write(srv, data, size); + free(data); + + if (rc >= 0) + async_answer_1(callid, EOK, rc); + else + async_answer_0(callid, rc); +} + +static void con_sync_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + if (srv->srvs->ops->sync == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + srv->srvs->ops->sync(srv); + async_answer_0(callid, EOK); +} + +static void con_clear_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + if (srv->srvs->ops->clear == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + srv->srvs->ops->clear(srv); + async_answer_0(callid, EOK); +} + +static void con_set_pos_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + sysarg_t col; + sysarg_t row; + + col = IPC_GET_ARG1(*call); + row = IPC_GET_ARG2(*call); + + if (srv->srvs->ops->set_pos == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + srv->srvs->ops->set_pos(srv, col, row); + async_answer_0(callid, EOK); +} + +static void con_get_pos_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + int rc; + sysarg_t col; + sysarg_t row; + + if (srv->srvs->ops->get_pos == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + rc = srv->srvs->ops->get_pos(srv, &col, &row); + async_answer_2(callid, rc, col, row); +} + +static void con_get_size_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + int rc; + sysarg_t cols; + sysarg_t rows; + + if (srv->srvs->ops->get_size == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + rc = srv->srvs->ops->get_size(srv, &cols, &rows); + async_answer_2(callid, rc, cols, rows); +} + +static void con_get_color_cap_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + int rc; + console_caps_t ccap; + + if (srv->srvs->ops->get_color_cap == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + rc = srv->srvs->ops->get_color_cap(srv, &ccap); + async_answer_1(callid, rc, (sysarg_t)ccap); +} + +static void con_set_style_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + console_style_t style; + + style = IPC_GET_ARG1(*call); + + if (srv->srvs->ops->set_style == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + srv->srvs->ops->set_style(srv, style); + async_answer_0(callid, EOK); +} + +static void con_set_color_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + console_color_t bgcolor; + console_color_t fgcolor; + console_color_attr_t flags; + + bgcolor = IPC_GET_ARG1(*call); + fgcolor = IPC_GET_ARG2(*call); + flags = IPC_GET_ARG3(*call); + + if (srv->srvs->ops->set_color == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + srv->srvs->ops->set_color(srv, bgcolor, fgcolor, flags); + async_answer_0(callid, EOK); +} + +static void con_set_rgb_color_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + pixel_t bgcolor; + pixel_t fgcolor; + + bgcolor = IPC_GET_ARG1(*call); + fgcolor = IPC_GET_ARG2(*call); + + if (srv->srvs->ops->set_rgb_color == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + srv->srvs->ops->set_rgb_color(srv, bgcolor, fgcolor); + async_answer_0(callid, EOK); +} + +static void con_set_cursor_visibility_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + bool show; + + show = IPC_GET_ARG1(*call); + + if (srv->srvs->ops->set_cursor_visibility == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + srv->srvs->ops->set_cursor_visibility(srv, show); + async_answer_0(callid, EOK); +} + +static void con_get_event_srv(con_srv_t *srv, ipc_callid_t callid, + ipc_call_t *call) +{ + int rc; + kbd_event_t event; + + if (srv->srvs->ops->get_event == NULL) { + async_answer_0(callid, ENOTSUP); + return; + } + + rc = srv->srvs->ops->get_event(srv, &event); + async_answer_4(callid, rc, event.type, event.key, event.mods, event.c); +} + +static con_srv_t *con_srv_create(con_srvs_t *srvs) +{ + con_srv_t *srv; + + srv = calloc(1, sizeof(*srv)); + if (srv == NULL) + return NULL; + + srv->srvs = srvs; + return srv; +} + +void con_srvs_init(con_srvs_t *srvs) +{ + srvs->ops = NULL; + srvs->sarg = NULL; + srvs->abort_timeout = 0; + srvs->aborted = false; +} + +int con_conn(ipc_callid_t iid, ipc_call_t *icall, con_srvs_t *srvs) +{ + con_srv_t *srv; + int rc; + + /* Accept the connection */ + async_answer_0(iid, EOK); + + srv = con_srv_create(srvs); + if (srv == NULL) + return ENOMEM; + +/* async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE); + if (sess == NULL) + return ENOMEM; + + srv->client_sess = sess; +*/ + srv->client_sess = NULL; + + rc = srvs->ops->open(srvs, srv); + if (rc != EOK) + return rc; + + while (true) { + ipc_call_t call; + ipc_callid_t callid = 0; + + while (callid == 0) { + /* XXX Need to be able to abort immediately */ + callid = async_get_call_timeout(&call, + srvs->abort_timeout); + + if (srv->srvs->aborted) { + if (callid != 0) + async_answer_0(callid, EINTR); + break; + } + } + + if (callid == 0) + break; + + sysarg_t method = IPC_GET_IMETHOD(call); + + if (!method) { + /* The other side has hung up */ + async_answer_0(callid, EOK); + break; + } + + switch (method) { + case VFS_OUT_READ: + con_read_srv(srv, callid, &call); + break; + case VFS_OUT_WRITE: + con_write_srv(srv, callid, &call); + break; + case VFS_OUT_SYNC: + con_sync_srv(srv, callid, &call); + break; + case CONSOLE_CLEAR: + con_clear_srv(srv, callid, &call); + break; + case CONSOLE_SET_POS: + con_set_pos_srv(srv, callid, &call); + break; + case CONSOLE_GET_POS: + con_get_pos_srv(srv, callid, &call); + break; + case CONSOLE_GET_SIZE: + con_get_size_srv(srv, callid, &call); + break; + case CONSOLE_GET_COLOR_CAP: + con_get_color_cap_srv(srv, callid, &call); + break; + case CONSOLE_SET_STYLE: + con_set_style_srv(srv, callid, &call); + break; + case CONSOLE_SET_COLOR: + con_set_color_srv(srv, callid, &call); + break; + case CONSOLE_SET_RGB_COLOR: + con_set_rgb_color_srv(srv, callid, &call); + break; + case CONSOLE_SET_CURSOR_VISIBILITY: + con_set_cursor_visibility_srv(srv, callid, &call); + break; + case CONSOLE_GET_EVENT: + con_get_event_srv(srv, callid, &call); + break; + default: + async_answer_0(callid, ENOTSUP); + } + } + + rc = srvs->ops->close(srv); + free(srv); + + return rc; +} + +/** @} + */ Index: uspace/lib/c/generic/io/console.c =================================================================== --- uspace/lib/c/generic/io/console.c (revision 6af521cb3008f864eedf879ad1afec38ba62ac67) +++ uspace/lib/c/generic/io/console.c (revision 0d57c3e8dc226ff58ff9c31e8727d5319cd44bf5) @@ -38,5 +38,4 @@ #include #include -#include #include #include @@ -126,5 +125,5 @@ { async_exch_t *exch = async_exchange_begin(ctrl->output_sess); - async_req_1_0(exch, CONSOLE_CURSOR_VISIBILITY, (show != false)); + async_req_1_0(exch, CONSOLE_SET_CURSOR_VISIBILITY, (show != false)); async_exchange_end(exch); } @@ -151,5 +150,5 @@ { async_exch_t *exch = async_exchange_begin(ctrl->output_sess); - async_req_2_0(exch, CONSOLE_GOTO, col, row); + async_req_2_0(exch, CONSOLE_SET_POS, col, row); async_exchange_end(exch); } Index: uspace/lib/c/generic/io/output.c =================================================================== --- uspace/lib/c/generic/io/output.c (revision 6af521cb3008f864eedf879ad1afec38ba62ac67) +++ uspace/lib/c/generic/io/output.c (revision 0d57c3e8dc226ff58ff9c31e8727d5319cd44bf5) @@ -37,4 +37,5 @@ #include #include +#include #include