/**
* \file
* <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction. Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License. This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
* Copyright 2006 Develer S.r.l. (http://www.develer.com/)
* -->
*
* \author Bernardo Innocenti <bernie@develer.com>
*/
-/*#*
- *#* $Log$
- *#* Revision 1.2 2006/06/12 21:37:02 marco
- *#* implemented some commands (ver and sleep)
- *#*
- *#* Revision 1.1 2006/06/01 12:29:21 marco
- *#* Add first simple protocol command (version request).
- *#*
- *#*/
-
#include "protocol.h"
#include <drv/ser.h>
#include <cfg/debug.h>
#include <verstag.h>
-#include <stdlib.h> /* malloc()
- TODO: substitute with a more appropriate
- memory allocator. */
-
+#include <stdlib.h>
#include <string.h>
-#include <cmd_hunk.h>
+//#include <cmd_hunk.h>
+#include "cmd_ctor.h" // MAKE_CMD, REGISTER_CMD
// DEBUG: set to 1 to force interactive mode
#define FORCE_INTERACTIVE 1
/**
* Send a NAK asking the host to send the current message again.
*
+ * \param ser serial port handle to output to.
* \param err human-readable description of the error for debug purposes.
*/
INLINE void NAK(Serial *ser, const char *err)
* Print args on s, with format specified in t->result_fmt.
* Return number of valid arguments or -1 in case of error.
*/
-static int protocol_reply(Serial *s, const struct CmdTemplate *t,
+static bool protocol_reply(Serial *s, const struct CmdTemplate *t,
const parms *args)
{
- int nres = strlen(t->result_fmt);
+ unsigned short offset = strlen(t->arg_fmt) + 1;
+ unsigned short nres = strlen(t->result_fmt);
- if (nres > 0)
+ ser_printf(s, "0");
+ for (unsigned short i = 0; i < nres; ++i)
{
- for (int i = strlen(t->arg_fmt); i < nres; ++i)
+ if (t->result_fmt[i] == 'd')
{
- if (t->result_fmt[i] == 'd')
- {
- ser_printf(s, "%ld", args[i].l);
- }
- else if (t->result_fmt[i] == 's')
- {
- ser_printf(s, "%s ", args[i].s);
- }
- else
- {
- return -1;
- }
+ ser_printf(s, " %ld", args[offset+i].l);
+ }
+ else if (t->result_fmt[i] == 's')
+ {
+ ser_printf(s, " %s", args[offset+i].s);
+ }
+ else
+ {
+ abort();
}
}
- ser_print(s, "\r\n");
- return nres;
+ ser_printf(s, "\r\n");
+ return true;
}
static void protocol_parse(Serial *ser, const char *buf)
templ = parser_get_cmd_template(buf);
if (!templ)
{
- NAK(ser, "Invalid command.");
+ ser_print(ser, "-1 Invalid command.");
return;
}
parms args[PARSER_MAX_ARGS];
- /* Args Check. */
+ /* Args Check. TODO: Handle different case. see doc/PROTOCOL . */
if (!parser_get_cmd_arguments(buf, templ, args))
{
- NAK(ser, "Invalid arguments.");
+ ser_print(ser, "-2 Invalid arguments.");
return;
}
/* Execute. */
- if (!parser_execute_cmd(templ, args))
+ if(!parser_execute_cmd(templ, args))
{
- NAK(ser, "Command failed.");
+ NAK(ser, "Error in executing command.");
}
- else
+ if (!protocol_reply(ser, templ, args))
{
- if (protocol_reply(ser, templ, args) < 0)
- {
- NAK(ser, "Invalid return format.");
- }
+ NAK(ser, "Invalid return format.");
}
return;
}
*
*/
-/* Version. */
-static ResultCode cmd_ver(const char **str)
+/* Version. Example of declaring function and passing it to MAKE_CMD. */
+static int ver_fn(const char **str)
{
*str = VERS_TAG;
return 0;
}
-static ResultCode cmd_ver_hunk(parms args_results[])
-{
- return cmd_ver(&args_results[0].s);
-}
+MAKE_CMD(ver, "", "s", ver_fn(&args[1].s))
-const struct CmdTemplate cmd_ver_template =
-{
- "ver", "", "s", cmd_ver_hunk, 0
-};
-
-//DECLARE_CMD_HUNK(ver, (NIL), (string)(NIL));
+/* Sleep. Example of declaring function body directly in macro call. */
+MAKE_CMD(sleep, "d", "",
+({
+ timer_delay((mtime_t)args[1].l);
+ 0;
+}))
-/* Sleep. */
-
-static ResultCode cmd_sleep(const long ms)
-{
- timer_delay((mtime_t)ms);
- return 0;
-}
-
-static ResultCode cmd_sleep_hunk(parms args[])
-{
- return cmd_sleep(args[1].l);
-}
-
-const struct CmdTemplate cmd_sleep_template =
-{
- "sleep", "d", "", cmd_sleep_hunk, 0
-};
+/* Ping. */
+MAKE_CMD(ping, "", "",
+({
+ 0;
+}))
/* Register commands. */
static void protocol_registerCmds(void)
{
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(quit));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(exit));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(wait));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(delay));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(SYN));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(RST));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(skip_end));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(restart));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(ver));
-// parser_register_cmd(&CMD_HUNK_TEMPLATE(power_off));
-
- parser_register_cmd(&cmd_ver_template);
- parser_register_cmd(&cmd_sleep_template);
+ REGISTER_CMD(ver);
+ REGISTER_CMD(sleep);
+ REGISTER_CMD(ping);
}
+
+/* Initialization: readline context, parser and register commands. */
void protocol_init(Serial *ser)
{
interactive = FORCE_INTERACTIVE;
- // Initialize the readline context used for interactive mode
rl_init_ctx(&rl_ctx);
rl_setprompt(&rl_ctx, ">> ");
rl_sethook_get(&rl_ctx, (getc_hook)ser_getchar, ser);
projects / bertos.git / blobdiff