X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Ftriface%2Fprotocol.c;h=08910d0426e26b85b0caaaf6c7efa11f34bb9068;hb=cb475c2071d6be7048f8c5c06485b3cd8530708c;hp=e659888b3d9c820c7b734cbd6dc287e4ff69e97d;hpb=91bbddad1da23825fefd07447d841ba7d6b8365a;p=bertos.git

diff --git a/app/triface/protocol.c b/app/triface/protocol.c
old mode 100755
new mode 100644
index e659888b..08910d04
--- a/app/triface/protocol.c
+++ b/app/triface/protocol.c
@@ -1,6 +1,31 @@
 /**
  * \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/)
  * -->
  *
@@ -14,25 +39,6 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* 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.
- *#*
- *#* 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>
@@ -46,7 +52,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <cmd_hunk.h>
+//#include <cmd_hunk.h>
 
 #include "cmd_ctor.h"  // MAKE_CMD, REGISTER_CMD
 
@@ -69,6 +75,7 @@ static struct RLContext rl_ctx;
 /**
  * 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)
@@ -218,14 +225,15 @@ void protocol_run(Serial *ser)
  *
  */
 
-/* Version.  */
-MAKE_CMD(ver, "", "s",
-({
-	args[1].s = VERS_TAG;
-	0;
-}))
+/* Version. Example of declaring function and passing it to MAKE_CMD.  */
+static int ver_fn(const char **str)
+{
+	*str = VERS_TAG;
+	return 0;
+}
+MAKE_CMD(ver, "", "s", ver_fn(&args[1].s))
 
-/* Sleep.  */
+/* Sleep. Example of declaring function body directly in macro call.  */
 MAKE_CMD(sleep, "d", "",
 ({
 	timer_delay((mtime_t)args[1].l);