/*#*
*#* $Log$
+ *#* Revision 1.7 2007/01/09 09:00:16 bernie
+ *#* Doxygen fix.
+ *#*
+ *#* Revision 1.6 2006/09/20 13:54:04 marco
+ *#* Usage examples of MAKE_CMD.
+ *#*
+ *#* Revision 1.5 2006/06/14 01:03:01 marco
+ *#* Add response code. Add command ping.
+ *#*
+ *#* Revision 1.4 2006/06/14 00:26:48 marco
+ *#* Use new macros for defining commands.
+ *#*
*#* Revision 1.3 2006/06/13 19:07:31 marco
*#* Fixed a bug in protocol_reply. Simplified rpc.
*#*
#include <cfg/debug.h>
#include <verstag.h>
+#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)
{
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 (unsigned short i = 0; i < nres; ++i)
+ if (t->result_fmt[i] == 'd')
{
- if (t->result_fmt[i] == 'd')
- {
- ser_printf(s, "%ld", args[offset+i].l);
- }
- else if (t->result_fmt[i] == 's')
- {
- ser_printf(s, "%s ", args[offset+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(parms *args)
+/* Version. Example of declaring function and passing it to MAKE_CMD. */
+static int ver_fn(const char **str)
{
- args[1].s = VERS_TAG;
+ *str = VERS_TAG;
return 0;
}
-const struct CmdTemplate cmd_ver_template =
-{
- "ver", "", "s", cmd_ver, 0
-};
+MAKE_CMD(ver, "", "s", ver_fn(&args[1].s))
-/* Sleep. */
-
-static ResultCode cmd_sleep(parms *args)
-{
+/* Sleep. Example of declaring function body directly in macro call. */
+MAKE_CMD(sleep, "d", "",
+({
timer_delay((mtime_t)args[1].l);
- return 0;
-}
-const struct CmdTemplate cmd_sleep_template =
-{
- "sleep", "d", "", cmd_sleep, 0
-};
+ 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);