summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--digital/ucoolib/ucoolib/base/proto/Config2
-rw-r--r--digital/ucoolib/ucoolib/base/proto/Module1
-rw-r--r--digital/ucoolib/ucoolib/base/proto/proto.cc257
-rw-r--r--digital/ucoolib/ucoolib/base/proto/proto.hh99
-rw-r--r--digital/ucoolib/ucoolib/base/proto/test/Makefile9
-rw-r--r--digital/ucoolib/ucoolib/base/proto/test/test_proto.cc67
6 files changed, 435 insertions, 0 deletions
diff --git a/digital/ucoolib/ucoolib/base/proto/Config b/digital/ucoolib/ucoolib/base/proto/Config
new file mode 100644
index 00000000..4edaa6b7
--- /dev/null
+++ b/digital/ucoolib/ucoolib/base/proto/Config
@@ -0,0 +1,2 @@
+[base/proto]
+args_max_size = 16
diff --git a/digital/ucoolib/ucoolib/base/proto/Module b/digital/ucoolib/ucoolib/base/proto/Module
new file mode 100644
index 00000000..68f866fe
--- /dev/null
+++ b/digital/ucoolib/ucoolib/base/proto/Module
@@ -0,0 +1 @@
+base_proto_SOURCES = proto.cc
diff --git a/digital/ucoolib/ucoolib/base/proto/proto.cc b/digital/ucoolib/ucoolib/base/proto/proto.cc
new file mode 100644
index 00000000..2e41a17f
--- /dev/null
+++ b/digital/ucoolib/ucoolib/base/proto/proto.cc
@@ -0,0 +1,257 @@
+// ucoolib - Microcontroller object oriented library. {{{
+//
+// Copyright (C) 2013 Nicolas Schodet
+//
+// APBTeam:
+// Web: http://apbteam.org/
+// Email: team AT apbteam DOT org
+//
+// This program 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// }}}
+#include "proto.hh"
+
+#include <cctype>
+
+namespace ucoo {
+
+Proto::Proto (Handler &handler, Stream &stream)
+ : handler_ (handler), stream_ (stream), step_ (IDLE)
+{
+}
+
+void
+Proto::accept ()
+{
+ int c;
+ while ((c = stream_.getc ()) != -1)
+ {
+ if (c == '!')
+ step_ = BANG;
+ else
+ {
+ switch (step_)
+ {
+ case IDLE:
+ // Nothing received yet.
+ break;
+ case BANG:
+ // Bang received yet.
+ if (std::isalpha (c))
+ {
+ cmd_ = c;
+ size_ = 0;
+ step_ = COMMAND;
+ }
+ else
+ {
+ handler_.proto_handle (*this, '?', 0, 0);
+ step_ = IDLE;
+ }
+ break;
+ case COMMAND:
+ // Command received yet.
+ if (c == '\r' || c == '\n')
+ {
+ handler_.proto_handle (*this, cmd_, args_, size_);
+ step_ = IDLE;
+ }
+ else if (c == '\'')
+ step_ = ARG_CHAR;
+ else if (c == '"')
+ step_ = ARG_STRING;
+ else
+ {
+ step_ = ARG_DIGIT;
+ accept_digit (c);
+ }
+ break;
+ case ARG_DIGIT:
+ step_ = COMMAND;
+ accept_digit (c);
+ break;
+ case ARG_CHAR:
+ step_ = COMMAND;
+ accept_char (c);
+ break;
+ case ARG_STRING:
+ if (c == '\r' || c == '\n')
+ {
+ handler_.proto_handle (*this, cmd_, args_, size_);
+ step_ = IDLE;
+ }
+ else
+ {
+ accept_char (c);
+ }
+ break;
+ }
+ }
+ }
+}
+
+void
+Proto::send (char cmd)
+{
+ char buf[3];
+ char *p = buf;
+ *p++ = '!';
+ *p++ = cmd;
+ *p++ = '\n';
+ stream_.write (buf, p - buf);
+}
+
+void
+Proto::send (char cmd, const char *fmt, int a0)
+{
+ send (cmd, fmt, a0, 0, 0, 0);
+}
+
+void
+Proto::send (char cmd, const char *fmt, int a0, int a1)
+{
+ send (cmd, fmt, a0, a1, 0, 0);
+}
+
+void
+Proto::send (char cmd, const char *fmt, int a0, int a1, int a2)
+{
+ send (cmd, fmt, a0, a1, a2, 0);
+}
+
+static inline void
+send_byte (char *buf, uint8_t b)
+{
+ static const char hexchars[] = "0123456789abcdef";
+ buf[0] = hexchars[b >> 4];
+ buf[1] = hexchars[b & 0xf];
+}
+
+static char *
+send_arg (char *buf, char fmt, int v)
+{
+ switch (fmt)
+ {
+ case 'L':
+ case 'l':
+ send_byte (buf, (v >> 24) & 0xff);
+ buf += 2;
+ send_byte (buf, (v >> 16) & 0xff);
+ buf += 2;
+ case 'H':
+ case 'h':
+ send_byte (buf, (v >> 8) & 0xff);
+ buf += 2;
+ case 'B':
+ case 'b':
+ send_byte (buf, v & 0xff);
+ buf += 2;
+ break;
+ default:
+ assert_unreachable ();
+ }
+ return buf;
+}
+
+void
+Proto::send (char cmd, const char *fmt, int a0, int a1, int a2, int a3)
+{
+ char buf[3 + 4 * 4 * 2]; // Large enough for the largest frame.
+ char *p = buf;
+ *p++ = '!';
+ *p++ = cmd;
+ if (*fmt)
+ {
+ p = send_arg (p, *fmt++, a0);
+ if (*fmt)
+ {
+ p = send_arg (p, *fmt++, a1);
+ if (*fmt)
+ {
+ p = send_arg (p, *fmt++, a2);
+ if (*fmt)
+ {
+ p = send_arg (p, *fmt++, a3);
+ }
+ }
+ }
+ }
+ *p++ = '\n';
+ stream_.write (buf, p - buf);
+}
+
+void
+Proto::send_buf (char cmd, const uint8_t *args, int size)
+{
+ int i;
+ char buf[3 + 2 * size];
+ char *p = buf;
+ *p++ = '!';
+ *p++ = cmd;
+ for (i = 0; i < size; i++)
+ {
+ send_byte (p, args[i]);
+ p += 2;
+ }
+ *p++ = '\n';
+ stream_.write (buf, p - buf);
+}
+
+void
+Proto::accept_digit (int c)
+{
+ // Test for argument list overflow.
+ if (size_ >= UCOO_CONFIG_BASE_PROTO_ARGS_MAX_SIZE)
+ {
+ handler_.proto_handle (*this, '?', 0, 0);
+ step_ = IDLE;
+ return;
+ }
+ // Convert from hexa.
+ if ('0' <= c && c <= '9')
+ c -= '0';
+ else if ('a' <= c && c <= 'f')
+ c -= 'a' - 10;
+ else if ('A' <= c && c <= 'F')
+ c -= 'A' - 10;
+ else
+ {
+ handler_.proto_handle (*this, '?', 0, 0);
+ step_ = IDLE;
+ return;
+ }
+ // Add digit.
+ args_[size_] <<= 4;
+ args_[size_] |= c;
+ if (step_ == COMMAND)
+ size_++;
+}
+
+void
+Proto::accept_char (int c)
+{
+ // Test for argument list overflow or unwanted char.
+ if (size_ >= UCOO_CONFIG_BASE_PROTO_ARGS_MAX_SIZE || !std::isprint (c))
+ {
+ handler_.proto_handle (*this, '?', 0, 0);
+ step_ = IDLE;
+ return;
+ }
+ // Add char.
+ args_[size_] = c;
+ size_++;
+}
+
+} // namespace ucoo
diff --git a/digital/ucoolib/ucoolib/base/proto/proto.hh b/digital/ucoolib/ucoolib/base/proto/proto.hh
new file mode 100644
index 00000000..3ac4d1d1
--- /dev/null
+++ b/digital/ucoolib/ucoolib/base/proto/proto.hh
@@ -0,0 +1,99 @@
+#ifndef ucoolib_base_proto_proto_hh
+#define ucoolib_base_proto_proto_hh
+// ucoolib - Microcontroller object oriented library. {{{
+//
+// Copyright (C) 2013 Nicolas Schodet
+//
+// APBTeam:
+// Web: http://apbteam.org/
+// Email: team AT apbteam DOT org
+//
+// This program 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// }}}
+#include "ucoolib/common.hh"
+#include "ucoolib/intf/stream.hh"
+
+#include "config/base/proto.hh"
+
+namespace ucoo {
+
+/// Support for old proto protocol.
+class Proto
+{
+ public:
+ /// Receivers should implement this interface.
+ class Handler
+ {
+ public:
+ /// Handle a received message.
+ virtual void proto_handle (Proto &proto, char cmd,
+ const uint8_t *args, int size) = 0;
+ };
+ public:
+ /// Constructor.
+ Proto (Handler &handler, Stream &stream);
+ /// Read from stream and handle any received message.
+ void accept ();
+ /// Send a message with no argument.
+ void send (char cmd);
+ /// Send a message with one argument.
+ void send (char cmd, const char *fmt, int a0);
+ /// Send a message with two arguments.
+ void send (char cmd, const char *fmt, int a0, int a1);
+ /// Send a message with three arguments.
+ void send (char cmd, const char *fmt, int a0, int a1, int a2);
+ /// Send a message with four arguments.
+ void send (char cmd, const char *fmt, int a0, int a1, int a2, int a3);
+ /// Send a message, with a byte buffer.
+ void send_buf (char cmd, const uint8_t *args, int size);
+ private:
+ /// Accept a digit to be used for args.
+ void accept_digit (int c);
+ /// Accept a quoted char to be used for args.
+ void accept_char (int c);
+ private:
+ /// Handler interface.
+ Handler &handler_;
+ /// Connected stream.
+ Stream &stream_;
+ /// Decoding step.
+ enum Step
+ {
+ /// Nothing received yet.
+ IDLE,
+ /// Exclamation mark received.
+ BANG,
+ /// Expecting argument or end of frame.
+ COMMAND,
+ /// Expecting second hex digit of an argument.
+ ARG_DIGIT,
+ /// Quote received, expect any char.
+ ARG_CHAR,
+ /// Double quote received, read a string.
+ ARG_STRING,
+ };
+ Step step_;
+ /// Received message current size.
+ int size_;
+ /// Message arguments being received.
+ uint8_t args_[UCOO_CONFIG_BASE_PROTO_ARGS_MAX_SIZE];
+ /// Command being received.
+ char cmd_;
+};
+
+} // namespace ucoo
+
+#endif // ucoolib_base_proto_proto_hh
diff --git a/digital/ucoolib/ucoolib/base/proto/test/Makefile b/digital/ucoolib/ucoolib/base/proto/test/Makefile
new file mode 100644
index 00000000..f02be13d
--- /dev/null
+++ b/digital/ucoolib/ucoolib/base/proto/test/Makefile
@@ -0,0 +1,9 @@
+BASE = ../../../..
+
+TARGETS = host stm32f4
+PROGS = test_proto
+test_proto_SOURCES = test_proto.cc
+
+MODULES = base/proto base/test hal/usb
+
+include $(BASE)/build/top.mk
diff --git a/digital/ucoolib/ucoolib/base/proto/test/test_proto.cc b/digital/ucoolib/ucoolib/base/proto/test/test_proto.cc
new file mode 100644
index 00000000..11f77832
--- /dev/null
+++ b/digital/ucoolib/ucoolib/base/proto/test/test_proto.cc
@@ -0,0 +1,67 @@
+// ucoolib - Microcontroller object oriented library. {{{
+//
+// Copyright (C) 2013 Nicolas Schodet
+//
+// APBTeam:
+// Web: http://apbteam.org/
+// Email: team AT apbteam DOT org
+//
+// This program 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// }}}
+#include "ucoolib/base/proto/proto.hh"
+
+#include "ucoolib/arch/arch.hh"
+#include "ucoolib/base/test/test.hh"
+
+class TestProto : public ucoo::Proto::Handler
+{
+ public:
+ void proto_handle (ucoo::Proto &proto, char cmd,
+ const uint8_t *args, int size)
+ {
+#define c(cmd, size) ((cmd) << 8 | (size))
+ switch (c (cmd, size))
+ {
+ // Receive various format.
+ case c ('a', 1):
+ case c ('a', 4):
+ case c ('b', 8):
+ // Send various formats.
+ proto.send ('h', "hh", -1, 1);
+ proto.send ('e', "B", 0xf0);
+ proto.send ('l', "HBB", 0x1234, 0x56, 0x78);
+ proto.send ('o', "L", 0x87654321u);
+ break;
+ default:
+ // Error, unknown command.
+ proto.send ('?');
+ return;
+ }
+ proto.send_buf (cmd, args, size);
+ }
+};
+
+int
+main (int argc, const char **argv)
+{
+ ucoo::arch_init (argc, argv);
+ ucoo::Stream &s = ucoo::test_stream ();
+ TestProto test_proto;
+ ucoo::Proto proto (test_proto, s);
+ while (1)
+ proto.accept ();
+}
+