Index: uspace/lib/libc/include/console.h =================================================================== --- uspace/lib/libc/include/console.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ (revision ) @@ -1,65 +1,0 @@ -/* - * Copyright (c) 2008 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_CONSOLE_H_ -#define LIBC_CONSOLE_H_ - -#include -#include -#include -#include - -extern int console_open(bool); -extern void console_close(void); -extern void console_wait(void); - -extern void console_clear(void); -extern void console_goto(int, int); -extern void console_putchar(wchar_t); -extern ssize_t console_write(const char *, size_t); -extern void console_putstr(const char *); -extern void console_flush(void); - -extern int console_get_size(int *, int *); -extern void console_set_style(int); -extern void console_set_color(int, int, int); -extern void console_set_rgb_color(int, int); -extern void console_cursor_visibility(int); - -extern void console_kcon_enable(void); - -#endif - -/** @} - */ Index: uspace/lib/libc/include/console/color.h =================================================================== --- uspace/lib/libc/include/console/color.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2008 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_CONSOLE_COLOR_H_ -#define LIBC_CONSOLE_COLOR_H_ - -enum console_color { - COLOR_BLACK = 0, - COLOR_BLUE = 1, - COLOR_GREEN = 2, - COLOR_CYAN = 3, - COLOR_RED = 4, - COLOR_MAGENTA = 5, - COLOR_YELLOW = 6, - COLOR_WHITE = 7, - - CATTR_BRIGHT = 8, - CATTR_BLINK = 8 -}; - -#endif - -/** @} - */ Index: uspace/lib/libc/include/console/style.h =================================================================== --- uspace/lib/libc/include/console/style.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2008 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_CONSOLE_STYLE_H_ -#define LIBC_CONSOLE_STYLE_H_ - -enum console_style { - STYLE_NORMAL = 0, - STYLE_EMPHASIS = 1 -}; - -#endif - -/** @} - */ Index: uspace/lib/libc/include/dirent.h =================================================================== --- uspace/lib/libc/include/dirent.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ uspace/lib/libc/include/dirent.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -36,5 +36,5 @@ #define LIBC_DIRENT_H_ -#define NAME_MAX 256 +#define NAME_MAX 256 struct dirent { @@ -47,5 +47,4 @@ } DIR; - extern DIR *opendir(const char *); extern struct dirent *readdir(DIR *); Index: uspace/lib/libc/include/fcntl.h =================================================================== --- uspace/lib/libc/include/fcntl.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ uspace/lib/libc/include/fcntl.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -36,11 +36,11 @@ #define LIBC_FCNTL_H_ -#define O_CREAT 1 -#define O_EXCL 2 -#define O_TRUNC 4 -#define O_APPEND 8 -#define O_RDONLY 16 -#define O_RDWR 32 -#define O_WRONLY 64 +#define O_CREAT 1 +#define O_EXCL 2 +#define O_TRUNC 4 +#define O_APPEND 8 +#define O_RDONLY 16 +#define O_RDWR 32 +#define O_WRONLY 64 extern int open(const char *, int, ...); Index: uspace/lib/libc/include/fibril.h =================================================================== --- uspace/lib/libc/include/fibril.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ uspace/lib/libc/include/fibril.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -41,11 +41,11 @@ #ifndef context_set -#define context_set(c, _pc, stack, size, ptls) \ - (c)->pc = (sysarg_t) (_pc); \ - (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ - (c)->tls = (sysarg_t) (ptls); +#define context_set(c, _pc, stack, size, ptls) \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = (sysarg_t) (ptls); #endif /* context_set */ -#define FIBRIL_SERIALIZED 1 +#define FIBRIL_SERIALIZED 1 typedef enum { Index: uspace/lib/libc/include/io/color.h =================================================================== --- uspace/lib/libc/include/io/color.h (revision 69e68e375d139e523412324273b080f3220c9461) +++ uspace/lib/libc/include/io/color.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2008 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_IO_COLOR_H_ +#define LIBC_IO_COLOR_H_ + +enum console_color { + COLOR_BLACK = 0, + COLOR_BLUE = 1, + COLOR_GREEN = 2, + COLOR_CYAN = 3, + COLOR_RED = 4, + COLOR_MAGENTA = 5, + COLOR_YELLOW = 6, + COLOR_WHITE = 7, + + CATTR_BRIGHT = 8, + CATTR_BLINK = 8 +}; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/console.h =================================================================== --- uspace/lib/libc/include/io/console.h (revision 69e68e375d139e523412324273b080f3220c9461) +++ uspace/lib/libc/include/io/console.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2008 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_IO_CONSOLE_H_ +#define LIBC_IO_CONSOLE_H_ + +#include +#include + +typedef enum { + KEY_PRESS, + KEY_RELEASE +} console_ev_type_t; + +/** Console event structure. */ +typedef struct { + /** Press or release event. */ + console_ev_type_t type; + + /** Keycode of the key that was pressed or released. */ + unsigned int key; + + /** Bitmask of modifiers held. */ + unsigned int mods; + + /** The character that was generated or '\0' for none. */ + wchar_t c; +} console_event_t; + +extern void console_clear(int phone); + +extern int console_get_size(int phone, ipcarg_t *rows, ipcarg_t *cols); +extern void console_goto(int phone, ipcarg_t row, ipcarg_t col); + +extern void console_set_style(int phone, int style); +extern void console_set_color(int phone, int fg_color, int bg_color, int flags); +extern void console_set_rgb_color(int phone, int fg_color, int bg_color); + +extern void console_cursor_visibility(int phone, bool show); +extern void console_kcon_enable(int phone); + +extern bool console_get_event(int phone, console_event_t *event); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/io.h =================================================================== --- uspace/lib/libc/include/io/io.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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_IO_H_ -#define LIBC_IO_H_ - -#include - -int putnchars(const char * buf, size_t count); -int putstr(const char * str); -int putchar(int c); -int getchar(void); - -#endif - -/** @} - */ - - Index: uspace/lib/libc/include/io/keycode.h =================================================================== --- uspace/lib/libc/include/io/keycode.h (revision 69e68e375d139e523412324273b080f3220c9461) +++ uspace/lib/libc/include/io/keycode.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2009 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_IO_KEYCODE_H_ +#define LIBC_IO_KEYCODE_H_ + +/** Keycode definitions. + * + * A keycode identifies a key by its position on the keyboard, rather + * than by its label. For human readability, key positions are noted + * with the key label on a keyboard with US layout. This label has + * nothing to do with the character, that the key produces + * -- this is determined by the keymap. + * + * The keyboard model reflects a standard PC keyboard layout. + * Non-standard keyboards need to be mapped to this model in some + * logical way. Scancodes are mapped to keycodes with a scanmap. + * + * For easier mapping to the model and to emphasize the nature of keycodes, + * they really are organized here by position, rather than by label. + */ +enum keycode { + + /* Main block row 1 */ + + KC_BACKTICK = 1, + + KC_1, + KC_2, + KC_3, + KC_4, + KC_5, + KC_6, + KC_7, + KC_8, + KC_9, + KC_0, + + KC_MINUS, + KC_EQUALS, + KC_BACKSPACE, + + /* Main block row 2 */ + + KC_TAB, + + KC_Q, + KC_W, + KC_E, + KC_R, + KC_T, + KC_Y, + KC_U, + KC_I, + KC_O, + KC_P, + + KC_LBRACKET, + KC_RBRACKET, + + /* Main block row 3 */ + + KC_CAPS_LOCK, + + KC_A, + KC_S, + KC_D, + KC_F, + KC_G, + KC_H, + KC_J, + KC_K, + KC_L, + + KC_SEMICOLON, + KC_QUOTE, + KC_BACKSLASH, + + KC_ENTER, + + /* Main block row 4 */ + + KC_LSHIFT, + + KC_Z, + KC_X, + KC_C, + KC_V, + KC_B, + KC_N, + KC_M, + + KC_COMMA, + KC_PERIOD, + KC_SLASH, + + KC_RSHIFT, + + /* Main block row 5 */ + + KC_LCTRL, + KC_LALT, + KC_SPACE, + KC_RALT, + KC_RCTRL, + + /* Function keys block */ + + KC_ESCAPE, + + KC_F1, + KC_F2, + KC_F3, + KC_F4, + KC_F5, + KC_F6, + KC_F7, + KC_F8, + KC_F9, + KC_F10, + KC_F11, + KC_F12, + + KC_PRTSCR, + KC_SCROLL_LOCK, + KC_PAUSE, + + /* Cursor keys block */ + + KC_INSERT, + KC_HOME, + KC_PAGE_UP, + + KC_DELETE, + KC_END, + KC_PAGE_DOWN, + + KC_UP, + KC_LEFT, + KC_DOWN, + KC_RIGHT, + + /* Numeric block */ + + KC_NUM_LOCK, + KC_NSLASH, + KC_NTIMES, + KC_NMINUS, + + KC_NPLUS, + KC_NENTER, + + KC_N7, + KC_N8, + KC_N9, + + KC_N4, + KC_N5, + KC_N6, + + KC_N1, + KC_N2, + KC_N3, + + KC_N0, + KC_NPERIOD + +} keycode_t; + +enum keymod { + KM_LSHIFT = 0x001, + KM_RSHIFT = 0x002, + KM_LCTRL = 0x004, + KM_RCTRL = 0x008, + KM_LALT = 0x010, + KM_RALT = 0x020, + KM_CAPS_LOCK = 0x040, + KM_NUM_LOCK = 0x080, + KM_SCROLL_LOCK = 0x100, + + KM_SHIFT = KM_LSHIFT | KM_RSHIFT, + KM_CTRL = KM_LCTRL | KM_RCTRL, + KM_ALT = KM_LALT | KM_RALT +} keymod_t; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/klog.h =================================================================== --- uspace/lib/libc/include/io/klog.h (revision 69e68e375d139e523412324273b080f3220c9461) +++ uspace/lib/libc/include/io/klog.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2006 Jakub Vana + * 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_STREAM_H_ +#define LIBC_STREAM_H_ + +#include + +extern size_t klog_write(const void *buf, size_t size); +extern void klog_update(void); + +#endif + +/** @} + */ Index: uspace/lib/libc/include/io/printf_core.h =================================================================== --- uspace/lib/libc/include/io/printf_core.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ uspace/lib/libc/include/io/printf_core.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -57,4 +57,2 @@ /** @} */ - - Index: uspace/lib/libc/include/io/stream.h =================================================================== --- uspace/lib/libc/include/io/stream.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Vana - * 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_STREAM_H_ -#define LIBC_STREAM_H_ - -#include - -#define EMFILE -17 - -extern ssize_t read_stdin(void *, size_t); -extern int klog_puts(const char *); -extern void klog_update(void); - -#endif - -/** @} - */ Index: uspace/lib/libc/include/io/style.h =================================================================== --- uspace/lib/libc/include/io/style.h (revision 69e68e375d139e523412324273b080f3220c9461) +++ uspace/lib/libc/include/io/style.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008 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_IO_STYLE_H_ +#define LIBC_IO_STYLE_H_ + +enum console_style { + STYLE_NORMAL = 0, + STYLE_EMPHASIS = 1 +}; + +#endif + +/** @} + */ Index: uspace/lib/libc/include/kbd/kbd.h =================================================================== --- uspace/lib/libc/include/kbd/kbd.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ (revision ) @@ -1,65 +1,0 @@ -/* - * Copyright (c) 2009 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_KBD_H_ -#define LIBC_KBD_H_ - -#include - -typedef enum kbd_ev_type { - KE_PRESS, - KE_RELEASE -} kbd_ev_type_t; - -/** Keyboard event structure. */ -typedef struct { - /** Press or release event. */ - kbd_ev_type_t type; - - /** Keycode of the key that was pressed or released. */ - unsigned int key; - - /** Bitmask of modifiers held. */ - unsigned int mods; - - /** The character that was generated or '\0' for none. */ - wchar_t c; -} kbd_event_t; - -extern int kbd_get_event(kbd_event_t *); - -#endif - -/** @} - */ Index: uspace/lib/libc/include/kbd/keycode.h =================================================================== --- uspace/lib/libc/include/kbd/keycode.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ (revision ) @@ -1,220 +1,0 @@ -/* - * Copyright (c) 2009 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_KBD_KEYCODE_H_ -#define LIBC_KBD_KEYCODE_H_ - -/** Keycode definitions. - * - * A keycode identifies a key by its position on the keyboard, rather - * than by its label. For human readability, key positions are noted - * with the key label on a keyboard with US layout. This label has - * nothing to do with the character, that the key produces - * -- this is determined by the keymap. - * - * The keyboard model reflects a standard PC keyboard layout. - * Non-standard keyboards need to be mapped to this model in some - * logical way. Scancodes are mapped to keycodes with a scanmap. - * - * For easier mapping to the model and to emphasize the nature of keycodes, - * they really are organized here by position, rather than by label. - */ -enum keycode { - - /* Main block row 1 */ - - KC_BACKTICK = 1, - - KC_1, - KC_2, - KC_3, - KC_4, - KC_5, - KC_6, - KC_7, - KC_8, - KC_9, - KC_0, - - KC_MINUS, - KC_EQUALS, - KC_BACKSPACE, - - /* Main block row 2 */ - - KC_TAB, - - KC_Q, - KC_W, - KC_E, - KC_R, - KC_T, - KC_Y, - KC_U, - KC_I, - KC_O, - KC_P, - - KC_LBRACKET, - KC_RBRACKET, - - /* Main block row 3 */ - - KC_CAPS_LOCK, - - KC_A, - KC_S, - KC_D, - KC_F, - KC_G, - KC_H, - KC_J, - KC_K, - KC_L, - - KC_SEMICOLON, - KC_QUOTE, - KC_BACKSLASH, - - KC_ENTER, - - /* Main block row 4 */ - - KC_LSHIFT, - - KC_Z, - KC_X, - KC_C, - KC_V, - KC_B, - KC_N, - KC_M, - - KC_COMMA, - KC_PERIOD, - KC_SLASH, - - KC_RSHIFT, - - /* Main block row 5 */ - - KC_LCTRL, - KC_LALT, - KC_SPACE, - KC_RALT, - KC_RCTRL, - - /* Function keys block */ - - KC_ESCAPE, - - KC_F1, - KC_F2, - KC_F3, - KC_F4, - KC_F5, - KC_F6, - KC_F7, - KC_F8, - KC_F9, - KC_F10, - KC_F11, - KC_F12, - - KC_PRTSCR, - KC_SCROLL_LOCK, - KC_PAUSE, - - /* Cursor keys block */ - - KC_INSERT, - KC_HOME, - KC_PAGE_UP, - - KC_DELETE, - KC_END, - KC_PAGE_DOWN, - - KC_UP, - KC_LEFT, - KC_DOWN, - KC_RIGHT, - - /* Numeric block */ - - KC_NUM_LOCK, - KC_NSLASH, - KC_NTIMES, - KC_NMINUS, - - KC_NPLUS, - KC_NENTER, - - KC_N7, - KC_N8, - KC_N9, - - KC_N4, - KC_N5, - KC_N6, - - KC_N1, - KC_N2, - KC_N3, - - KC_N0, - KC_NPERIOD - -} keycode_t; - -enum keymod { - KM_LSHIFT = 0x001, - KM_RSHIFT = 0x002, - KM_LCTRL = 0x004, - KM_RCTRL = 0x008, - KM_LALT = 0x010, - KM_RALT = 0x020, - KM_CAPS_LOCK = 0x040, - KM_NUM_LOCK = 0x080, - KM_SCROLL_LOCK = 0x100, - - KM_SHIFT = KM_LSHIFT | KM_RSHIFT, - KM_CTRL = KM_LCTRL | KM_RCTRL, - KM_ALT = KM_LALT | KM_RALT -} keymod_t; - -#endif - -/** @} - */ Index: uspace/lib/libc/include/stdio.h =================================================================== --- uspace/lib/libc/include/stdio.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ uspace/lib/libc/include/stdio.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -39,73 +39,86 @@ #include -#define EOF (-1) - -#include -#include +#define EOF (-1) #define DEBUG(fmt, ...) \ { \ char buf[256]; \ - int n; \ - n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \ + int n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \ if (n > 0) \ (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, str_size(buf)); \ } +#ifndef SEEK_SET + #define SEEK_SET 0 + #define SEEK_CUR 1 + #define SEEK_END 2 +#endif + typedef struct { /** Underlying file descriptor. */ int fd; - + /** Error indicator. */ int error; - + /** End-of-file indicator. */ int eof; + + /** Klog indicator */ + int klog; + + /** Phone to the file provider */ + int phone; } FILE; -extern FILE *stdin, *stdout, *stderr; +extern FILE stdin_null; +extern FILE stdout_klog; + +extern FILE *stdin; +extern FILE *stdout; +extern FILE *stderr; + +/* Character and string input functions */ +extern int fgetc(FILE *); +extern char *fgets(char *, size_t, FILE *); extern int getchar(void); +extern char *gets(char *, size_t); +/* Character and string output functions */ +extern int fputc(wchar_t, FILE *); +extern int fputs(const char *, FILE *); + +extern int putchar(wchar_t); extern int puts(const char *); -extern int putchar(int); -extern int fflush(FILE *); + +/* Formatted string output functions */ +extern int fprintf(FILE *, const char*, ...); +extern int vfprintf(FILE *, const char *, va_list); extern int printf(const char *, ...); +extern int vprintf(const char *, va_list); + +extern int snprintf(char *, size_t , const char *, ...); extern int asprintf(char **, const char *, ...); -extern int sprintf(char *, const char *, ...); -extern int snprintf(char *, size_t , const char *, ...); - -extern int vprintf(const char *, va_list); -extern int vsprintf(char *, const char *, va_list); extern int vsnprintf(char *, size_t, const char *, va_list); -extern int rename(const char *, const char *); - +/* File stream functions */ extern FILE *fopen(const char *, const char *); extern int fclose(FILE *); + extern size_t fread(void *, size_t, size_t, FILE *); extern size_t fwrite(const void *, size_t, size_t, FILE *); + +extern int fseek(FILE *, long, int); +extern int ftell(FILE *); extern int feof(FILE *); + +extern int fflush(FILE *); extern int ferror(FILE *); extern void clearerr(FILE *); -extern int fgetc(FILE *); -extern int fputc(int, FILE *); -extern int fputs(const char *, FILE *); - -extern int fprintf(FILE *, const char *, ...); -extern int vfprintf(FILE *, const char *, va_list); - -#define getc fgetc -#define putc fputc - -extern int fseek(FILE *, long, int); - -#ifndef SEEK_SET - #define SEEK_SET 0 - #define SEEK_CUR 1 - #define SEEK_END 2 -#endif +/* Misc file functions */ +extern int rename(const char *, const char *); #endif Index: uspace/lib/libc/include/unistd.h =================================================================== --- uspace/lib/libc/include/unistd.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ uspace/lib/libc/include/unistd.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -40,24 +40,28 @@ #ifndef NULL -#define NULL 0 + #define NULL 0 #endif -#define getpagesize() (PAGE_SIZE) +#define getpagesize() (PAGE_SIZE) #ifndef SEEK_SET - #define SEEK_SET 0 - #define SEEK_CUR 1 - #define SEEK_END 2 + #define SEEK_SET 0 + #define SEEK_CUR 1 + #define SEEK_END 2 #endif extern ssize_t write(int, const void *, size_t); extern ssize_t read(int, void *, size_t); + extern off_t lseek(int, off_t, int); extern int ftruncate(int, off_t); + extern int close(int); +extern int fsync(int); extern int unlink(const char *); + +extern char *getcwd(char *buf, size_t); extern int rmdir(const char *); extern int chdir(const char *); -extern char *getcwd(char *buf, size_t); extern void _exit(int status) __attribute__ ((noreturn)); Index: uspace/lib/libc/include/vfs/vfs.h =================================================================== --- uspace/lib/libc/include/vfs/vfs.h (revision ca3ba3adcee88ce492856583d1676e131dac9409) +++ uspace/lib/libc/include/vfs/vfs.h (revision 69e68e375d139e523412324273b080f3220c9461) @@ -37,4 +37,13 @@ #include +#include +#include +#include + +typedef struct { + fs_handle_t fs_handle; + dev_handle_t dev_handle; + fs_index_t index; +} fs_node_t; extern char *absolutize(const char *, size_t *); @@ -43,4 +52,12 @@ unsigned int flags); +extern int open_node(fs_node_t *node, int oflag); +extern int fd_phone(int); +extern void fd_node(int, fs_node_t *); + +extern FILE *fopen_node(fs_node_t *node, const char *); +extern int fphone(FILE *); +extern void fnode(FILE *stream, fs_node_t *node); + #endif