Index: uspace/lib/c/include/io/con_srv.h =================================================================== --- uspace/lib/c/include/io/con_srv.h (revision 3ccba143f0e65b2bc3d74365b212d9d8c55bc2a8) +++ uspace/lib/c/include/io/con_srv.h (revision 3ccba143f0e65b2bc3d74365b212d9d8c55bc2a8) @@ -0,0 +1,94 @@ +/* + * 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 + */ + +#ifndef LIBC_CON_SRV_H_ +#define LIBC_CON_SRV_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +typedef struct con_ops con_ops_t; + +/** Service setup (per sevice) */ +typedef struct { + con_ops_t *ops; + void *sarg; + /** Period to check for abort */ + suseconds_t abort_timeout; + bool aborted; +} con_srvs_t; + +/** Server structure (per client session) */ +typedef struct { + con_srvs_t *srvs; + async_sess_t *client_sess; + void *carg; +} con_srv_t; + +typedef struct con_ops { + int (*open)(con_srvs_t *, con_srv_t *); + int (*close)(con_srv_t *); + int (*read)(con_srv_t *, void *, size_t); + int (*write)(con_srv_t *, void *, size_t); + void (*sync)(con_srv_t *); + void (*clear)(con_srv_t *); + void (*set_pos)(con_srv_t *, sysarg_t col, sysarg_t row); + int (*get_pos)(con_srv_t *, sysarg_t *, sysarg_t *); + int (*get_size)(con_srv_t *, sysarg_t *, sysarg_t *); + int (*get_color_cap)(con_srv_t *, console_caps_t *); + void (*set_style)(con_srv_t *, console_style_t); + void (*set_color)(con_srv_t *, console_color_t, console_color_t, + console_color_attr_t); + void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t); + void (*set_cursor_visibility)(con_srv_t *, bool); + int (*get_event)(con_srv_t *, kbd_event_t *); +} con_ops_t; + +extern void con_srvs_init(con_srvs_t *); + +extern int con_conn(ipc_callid_t, ipc_call_t *, con_srvs_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/io/concaps.h =================================================================== --- uspace/lib/c/include/io/concaps.h (revision 3ccba143f0e65b2bc3d74365b212d9d8c55bc2a8) +++ uspace/lib/c/include/io/concaps.h (revision 3ccba143f0e65b2bc3d74365b212d9d8c55bc2a8) @@ -0,0 +1,48 @@ +/* + * 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 libcipc + * @{ + */ +/** @file + */ + +#ifndef LIBC_IO_CONCAPS_H_ +#define LIBC_IO_CONCAPS_H_ + +typedef enum { + CONSOLE_CAP_NONE = 0, + CONSOLE_CAP_STYLE = 1, + CONSOLE_CAP_INDEXED = 2, + CONSOLE_CAP_RGB = 4 +} console_caps_t; + +#endif + +/** @} + */ Index: uspace/lib/c/include/io/console.h =================================================================== --- uspace/lib/c/include/io/console.h (revision aa492fe19494af0906b221865dbd7568f0b09cda) +++ uspace/lib/c/include/io/console.h (revision 3ccba143f0e65b2bc3d74365b212d9d8c55bc2a8) @@ -37,4 +37,5 @@ #include +#include #include #include @@ -42,11 +43,4 @@ #include #include - -typedef enum { - CONSOLE_CAP_NONE = 0, - CONSOLE_CAP_STYLE = 1, - CONSOLE_CAP_INDEXED = 2, - CONSOLE_CAP_RGB = 4 -} console_caps_t; /** Console control structure. */