From 344e9b5474fe0185ab732b5c68d024e4703b8609 Mon Sep 17 00:00:00 2001 From: asterix Date: Fri, 7 May 2010 16:01:09 +0000 Subject: [PATCH] Add wizard mark. Clean up. Use kfile instead ser. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3629 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cfg/cfg_parser.h | 5 +---- bertos/mware/parser.c | 29 ++++++++++++++--------------- bertos/mware/parser.h | 8 +++++--- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/bertos/cfg/cfg_parser.h b/bertos/cfg/cfg_parser.h index c28dcc3e..572b4a24 100644 --- a/bertos/cfg/cfg_parser.h +++ b/bertos/cfg/cfg_parser.h @@ -32,16 +32,13 @@ * * \brief Configuration file for parser module. * - * \version $Id$ - * * \author Daniele Basile */ #ifndef CFG_PARSER_H #define CFG_PARSER_H -/// TODO -#define CONFIG_INTERNAL_COMMANDS 0 + #endif /* CFG_PARSER_H */ diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c index 57dc6cf9..b06013c8 100644 --- a/bertos/mware/parser.c +++ b/bertos/mware/parser.c @@ -30,9 +30,9 @@ * All Rights Reserved. * --> * - * \brief Serial protocol parser and commands. + * \brief Channel protocol parser and commands. * - * This file contains the serial protocol parser and + * This file contains the channel protocol parser and * the definition of the protocol commands. Commands are defined * in a "CmdTemplate" type array, containing: * - the name of the command, @@ -45,8 +45,6 @@ * argument is determined by format strings present in the * CmdTemplate table. * - * \version $Id$ - * * \author Bernie Innocenti * \author Stefano Fedrigo * \author Giovanni Bajo @@ -59,13 +57,14 @@ #include "cfg/cfg_parser.h" -#include +#include #include #include // atol(), NULL #include // strchr(), strcmp() - +//TODO: +#define CONFIG_INTERNAL_COMMANDS 0 #define ARG_SEP_S " " #define ARG_SEP_C ' ' @@ -173,13 +172,13 @@ static bool parseArgs(const char *fmt, const char *input, parms argv[]) * in the array result, using the format specified * in fmt. * - * \param ser Serial handle. + * \param ch Channel handle. * \param fmt Values format string. * \param result Array containing result to be printed. * * \return -1 in case of errors, otherwise 0. */ -static int printResult(struct Serial *ser, const char *fmt, parms result[]) +static int printResult(KFile *ch, const char *fmt, parms result[]) { long n; char repeat_cnt = 0; @@ -203,23 +202,23 @@ static int printResult(struct Serial *ser, const char *fmt, parms result[]) switch (*fmt) { case 'd': - ser_printf(ser, ARG_SEP_S "%ld", (*result).l); + kfile_printf(ch, ARG_SEP_S "%ld", (*result).l); result++; break; case 'c': - ser_print(ser, ARG_SEP_S); - ser_print(ser, (*result).s); + kfile_print(ch, ARG_SEP_S); + kfile_print(ch, (*result).s); result++; break; case 's': - ser_printf(ser, ARG_SEP_S "%s", (*result).s); + kfile_printf(ch, ARG_SEP_S "%s", (*result).s); result++; break; case 'n': n = (*result++).l; - ser_printf(ser, ARG_SEP_S "%ld", n); + kfile_printf(ch, ARG_SEP_S "%ld", n); while (n--) { - ser_printf(ser, ARG_SEP_S "%ld", (*result).l); + kfile_printf(ch, ARG_SEP_S "%ld", (*result).l); result++; } break; @@ -236,7 +235,7 @@ static int printResult(struct Serial *ser, const char *fmt, parms result[]) } /* while (*fmt) */ - ser_print(ser, "\r\n"); + kfile_print(ch, "\r\n"); return 0; } #endif /* UNUSED_CODE */ diff --git a/bertos/mware/parser.h b/bertos/mware/parser.h index 93fb8d8f..16fa4534 100644 --- a/bertos/mware/parser.h +++ b/bertos/mware/parser.h @@ -30,13 +30,15 @@ * All Rights Reserved. * --> * - * \version $Id$ - * * \author Bernie Innocenti * \author Stefano Fedrigo * \author Giovanni Bajo * - * \brief serial protocol parser and commands. + * \brief Channel protocol parser and commands. + * + * $WIZ$ module_name = "parser" + * $WIZ$ module_configuration = "bertos/cfg/cfg_parser.h" + * $WIZ$ module_depends = "kfile", "hashtable" */ -- 2.25.1