* the GNU General Public License.
*
* Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
*
* -->
*
*
* \author Giovanni Bajo <rasky@develer.com>
* \author Marco Benelli <marco@develer.com>
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
+ * \author Daniele Basile <asterix@develer.com>
*/
#include "protocol.h"
-
+#include "cmd_ctor.h" // MAKE_CMD, REGISTER_CMD
+#include "verstag.h"
+#include "hw/hw_adc.h"
+#include "hw/hw_input.h"
#include <drv/timer.h>
#include <drv/ser.h>
+#include <drv/sipo.h>
+#include <drv/wdt.h>
+#include <drv/buzzer.h>
+
#include <mware/readline.h>
#include <mware/parser.h>
+
#include <cfg/compiler.h>
#include <cfg/debug.h>
-#include <drv/sipo.h>
-#include <drv/wdt.h>
-#include "hw_adc.h"
+
+#include <kern/kfile.h>
#include <stdlib.h>
#include <string.h>
-//#include <cmd_hunk.h>
-
-#include "cmd_ctor.h" // MAKE_CMD, REGISTER_CMD
-#include "hw_input.h"
-#include "verstag.h"
-#include <drv/buzzer.h>
-
// Define the format string for ADC
#define ADC_FORMAT_STR "dddd"
/**
* Send a NAK asking the host to send the current message again.
*
- * \param err human-readable description of the error for debug purposes.
+ * \a fd kfile handler for serial.
+ * \a err human-readable description of the error for debug purposes.
*/
-INLINE void NAK(Serial *ser, const char *err)
+INLINE void NAK(KFile *fd, const char *err)
{
#ifdef _DEBUG
- ser_printf(ser, "NAK \"%s\"\r\n", err);
+ kfile_printf(fd, "NAK \"%s\"\r\n", err);
#else
- ser_printf(ser, "NAK\r\n");
+ kfile_printf(fd, "NAK\r\n");
#endif
}
-static void protocol_prompt(Serial *ser)
+static void protocol_prompt(KFile *fd)
{
- ser_print(ser, ">> ");
+ kfile_print(fd, ">> ");
}
/*
* Print args on s, with format specified in t->result_fmt.
* Return number of valid arguments or -1 in case of error.
*/
-static bool protocol_reply(Serial *s, const struct CmdTemplate *t,
+static bool protocol_reply(KFile *fd, const struct CmdTemplate *t,
const parms *args)
{
unsigned short offset = strlen(t->arg_fmt) + 1;
{
if (t->result_fmt[i] == 'd')
{
- ser_printf(s, " %ld", args[offset+i].l);
+ kfile_printf(fd, " %ld", args[offset+i].l);
}
else if (t->result_fmt[i] == 's')
{
- ser_printf(s, " %s", args[offset+i].s);
+ kfile_printf(fd, " %s", args[offset+i].s);
}
else
abort();
}
}
- ser_printf(s, "\r\n");
+ kfile_printf(fd, "\r\n");
return true;
}
-static void protocol_parse(Serial *ser, const char *buf)
+static void protocol_parse(KFile *fd, const char *buf)
{
const struct CmdTemplate *templ;
templ = parser_get_cmd_template(buf);
if (!templ)
{
- ser_print(ser, "-1 Invalid command.\r\n");
- protocol_prompt(ser);
+ kfile_print(fd, "-1 Invalid command.\r\n");
+ protocol_prompt(fd);
return;
}
/* Args Check. TODO: Handle different case. see doc/PROTOCOL . */
if (!parser_get_cmd_arguments(buf, templ, args))
{
- ser_print(ser, "-2 Invalid arguments.\r\n");
- protocol_prompt(ser);
+ kfile_print(fd, "-2 Invalid arguments.\r\n");
+ protocol_prompt(fd);
return;
}
/* Execute. */
if(!parser_execute_cmd(templ, args))
{
- NAK(ser, "Error in executing command.");
+ NAK(fd, "Error in executing command.");
}
- if (!protocol_reply(ser, templ, args))
+ if (!protocol_reply(fd, templ, args))
{
- NAK(ser, "Invalid return format.");
+ NAK(fd, "Invalid return format.");
}
- protocol_prompt(ser);
+ protocol_prompt(fd);
return;
}
-void protocol_run(Serial *ser)
+void protocol_run(KFile *fd)
{
/**
* \todo to be removed, we could probably access the serial FIFO
if (!interactive)
{
- ser_gets(ser, linebuf, sizeof(linebuf));
+ kfile_gets(fd, linebuf, sizeof(linebuf));
// reset serial port error anyway
- ser_setstatus(ser, 0);
+ kfile_clearerr(fd);
// check message minimum length
if (linebuf[0])
if (linebuf[0] == 0x1B && linebuf[1] == 0x1B) // ESC
{
interactive = true;
- ser_printf(ser,
- "Entering interactive mode\r\n");
+ kfile_printf(fd, "Entering interactive mode\r\n");
}
else
{
- protocol_parse(ser, linebuf);
+ protocol_parse(fd, linebuf);
}
}
}
if (!strcmp(buf, "exit") || !strcmp(buf, "quit"))
{
rl_clear_history(&rl_ctx);
- ser_printf(ser,
- "Leaving interactive mode...\r\n");
+ kfile_printf(fd, "Leaving interactive mode...\r\n");
interactive = FORCE_INTERACTIVE;
}
else
strncpy(linebuf + 2, buf, sizeof(linebuf) - 3);
linebuf[sizeof(linebuf) - 1] = '\0';
- protocol_parse(ser, linebuf);
+ protocol_parse(fd, linebuf);
}
}
}
0;
}), 0)
-/* Doutx sperimentale....... */
-MAKE_CMD(doutx, "d", "",
- ({
- sipo_putchar((uint8_t)args[1].l);
-
- //Store status of dout ports.
- reg_status_dout = (uint8_t)args[1].l;
- 0;
- }), 0)
/* Reset */
MAKE_CMD(reset, "", "",
(void)args;
wdt_init(7);
wdt_start();
+
+ /*We want to have an infinite loop that lock access on watchdog timer.
+ This piece of code it's equivalent to a while(true), but we have done this because
+ gcc generate a warning message that suggest to use "noreturn" parameter in function reset.*/
+ ASSERT(args);
+ while(args);
0;
+
}), 0)
/* Din */
//Set off all dout ports.
reg_status_dout = 0;
REGISTER_CMD(rdout);
- REGISTER_CMD(doutx);
REGISTER_CMD(reset);
REGISTER_CMD(din);
REGISTER_CMD(ain);
}
/* Initialization: readline context, parser and register commands. */
-void protocol_init(Serial *ser)
+void protocol_init(KFile *fd)
{
interactive = FORCE_INTERACTIVE;
rl_init_ctx(&rl_ctx);
//rl_setprompt(&rl_ctx, ">> ");
- rl_sethook_get(&rl_ctx, (getc_hook)ser_getchar, ser);
- rl_sethook_put(&rl_ctx, (putc_hook)ser_putchar, ser);
+ rl_sethook_get(&rl_ctx, (getc_hook)kfile_getc, fd);
+ rl_sethook_put(&rl_ctx, (putc_hook)kfile_putc, fd);
rl_sethook_match(&rl_ctx, parser_rl_match, NULL);
- rl_sethook_clear(&rl_ctx, (clear_hook)ser_clearstatus,ser);
+ rl_sethook_clear(&rl_ctx, (clear_hook)kfile_clearerr,fd);
parser_init();
protocol_registerCmds();
- protocol_prompt(ser);
+ protocol_prompt(fd);
}
projects / bertos.git / blobdiff