Index: generic/include/console/kconsole.h =================================================================== --- generic/include/console/kconsole.h (revision 902fb856d1931fcf547fdb933b2933b0d2f6474d) +++ generic/include/console/kconsole.h (revision 902fb856d1931fcf547fdb933b2933b0d2f6474d) @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2005 Jakub Jermar + * 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. + */ + +#ifndef __KCONSOLE_H__ +#define __KCONSOLE_H__ + +#include +#include +#include + +enum cmd_arg_type { + ARG_TYPE_INVALID = 0, + ARG_TYPE_INT, + ARG_TYPE_STRING +}; + +/** Structure representing one argument of kconsole command line. */ +struct cmd_arg { + cmd_arg_type_t type; /**< Type descriptor. */ + void *buffer; /**< Buffer where to store data. */ + size_t len; /**< Size of the buffer. */ +}; + +/** Structure representing one kconsole command. */ +struct cmd_info { + link_t link; /**< Command list link. */ + spinlock_t lock; /**< This lock protects everything below. */ + const char *name; /**< Command name. */ + const char *description; /**< Textual description. */ + int (* func)(cmd_arg_t *); /**< Function implementing the command. */ + count_t argc; /**< Number of arguments. */ + cmd_arg_t *argv; /**< Argument vector. */ + void (* help)(void); /**< Function for printing detailed help. */ +}; + +extern spinlock_t cmd_lock; +extern link_t cmd_head; + +extern void kconsole_init(void); +extern void kconsole(void *arg); + +extern int cmd_register(cmd_info_t *cmd); + +#endif Index: generic/include/func.h =================================================================== --- generic/include/func.h (revision ff3b319747ef6a37e65c572ab02d43341c925c0c) +++ generic/include/func.h (revision 902fb856d1931fcf547fdb933b2933b0d2f6474d) @@ -38,5 +38,6 @@ extern size_t strlen(const char *str); -extern int strcmp(const char *src, const char *dst, size_t len); +extern int strncmp(const char *src, const char *dst, size_t len); +extern void strncpy(char *dest, const char *src, size_t len); #endif Index: generic/include/macros.h =================================================================== --- generic/include/macros.h (revision ff3b319747ef6a37e65c572ab02d43341c925c0c) +++ generic/include/macros.h (revision 902fb856d1931fcf547fdb933b2933b0d2f6474d) @@ -37,3 +37,6 @@ #define is_white(c) (((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r')) +#define min(a,b) ((a)<(b)?(a):(b)) +#define max(a,b) ((a)>(b)?(a):(b)) + #endif Index: generic/include/main/kconsole.h =================================================================== --- generic/include/main/kconsole.h (revision ff3b319747ef6a37e65c572ab02d43341c925c0c) +++ (revision ) @@ -1,68 +1,0 @@ -/* - * Copyright (C) 2005 Jakub Jermar - * 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. - */ - -#ifndef __KCONSOLE_H__ -#define __KCONSOLE_H__ - -#include -#include -#include - -enum cmd_arg_type { - ARG_TYPE_INVALID = 0, - ARG_TYPE_INT, - ARG_TYPE_STRING -}; - -/** Structure representing one argument of kconsole command line. */ -struct cmd_arg { - cmd_arg_type_t type; /**< Type descriptor. */ - void *buffer; /**< Buffer where to store data. */ - size_t buflen; /**< Size of the buffer. */ -}; - -/** Structure representing one kconsole command. */ -struct cmd_info { - link_t link; /**< Command list link. */ - spinlock_t lock; /**< This lock protects everything below. */ - const char *name; /**< Command name. */ - const char *description; /**< Textual description. */ - int (* func)(cmd_arg_t *cmd); /**< Function implementing the command. */ - count_t argc; /**< Number of arguments. */ - cmd_arg_t *argv; /**< Argument vector. */ -}; - -extern spinlock_t cmd_lock; -extern link_t cmd_head; - -extern void kconsole_init(void); -extern void kconsole(void *arg); - -extern int cmd_register(cmd_info_t *cmd); - -#endif