X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Ftriface%2Fprotocol.c;h=23f4612e3b8cde5fb1b64cd1c5be76cf5341d9d8;hb=d712898666587cc12539e58fc93fcdeb5ec355cc;hp=7dc434e64e901687cacbc0a36ffa375ca2662920;hpb=cfd59c8655ed7268c9c48aa58560158d235bc0de;p=bertos.git diff --git a/app/triface/protocol.c b/app/triface/protocol.c index 7dc434e6..23f4612e 100644 --- a/app/triface/protocol.c +++ b/app/triface/protocol.c @@ -39,31 +39,32 @@ * \author Giovanni Bajo * \author Marco Benelli * \author Bernardo Innocenti + * \author Daniele Basile */ #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 #include +#include +#include +#include + #include #include + #include #include -#include -#include -#include "hw_adc.h" + +#include #include #include -//#include - -#include "cmd_ctor.h" // MAKE_CMD, REGISTER_CMD -#include "hw_input.h" -#include "verstag.h" -#include - // Define the format string for ADC #define ADC_FORMAT_STR "dddd" @@ -86,27 +87,28 @@ uint8_t reg_status_dout; /** * 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; @@ -116,11 +118,11 @@ static bool protocol_reply(Serial *s, const struct CmdTemplate *t, { 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 @@ -128,11 +130,11 @@ static bool protocol_reply(Serial *s, const struct CmdTemplate *t, 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; @@ -140,8 +142,8 @@ static void protocol_parse(Serial *ser, const char *buf) 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; } @@ -150,26 +152,26 @@ static void protocol_parse(Serial *ser, const char *buf) /* 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 @@ -179,10 +181,10 @@ void protocol_run(Serial *ser) 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]) @@ -194,12 +196,11 @@ void protocol_run(Serial *ser) 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); } } } @@ -228,8 +229,7 @@ void protocol_run(Serial *ser) 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 @@ -240,7 +240,7 @@ void protocol_run(Serial *ser) strncpy(linebuf + 2, buf, sizeof(linebuf) - 3); linebuf[sizeof(linebuf) - 1] = '\0'; - protocol_parse(ser, linebuf); + protocol_parse(fd, linebuf); } } } @@ -294,15 +294,6 @@ MAKE_CMD(rdout, "", "d", 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, "", "", @@ -350,7 +341,6 @@ static void protocol_registerCmds(void) //Set off all dout ports. reg_status_dout = 0; REGISTER_CMD(rdout); - REGISTER_CMD(doutx); REGISTER_CMD(reset); REGISTER_CMD(din); REGISTER_CMD(ain); @@ -358,20 +348,20 @@ static void protocol_registerCmds(void) } /* 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); }