Reformat. Fix headguard name. Clean up.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1313 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/mware/parser.c b/bertos/mware/parser.c
index cc20b4e6a79e97a8fefef5e9323fb3e5ef141390..6e23bcec5115498cc2268db07e7aeaa780d84b91 100644 (file)
--- a/bertos/mware/parser.c
+++ b/bertos/mware/parser.c
@@ -30,12 +30,6 @@
  * All Rights Reserved.
  * -->
  *
- * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
- * \author Stefano Fedrigo <aleph@develer.com>
- * \author Giovanni Bajo <rasky@develer.com>
- *
  * \brief Serial protocol parser and commands.
  *
  * This file contains the serial protocol parser and
@@ -50,18 +44,28 @@
  * using an union: the element of the union to use for each
  * argument is determined by format strings present in the
  * CmdTemplate table.
+ *
+ * \version $Id$
+ *
+ * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Stefano Fedrigo <aleph@develer.com>
+ * \author Giovanni Bajo <rasky@develer.com>
+ *
+ *
  */
 
 
 #include "parser.h"
+
+#include "appconfig.h"
+
 #include <drv/ser.h>
+#include <mware/hashtable.h>
 
 #include <stdlib.h> // atol(), NULL
 #include <string.h> // strchr(), strcmp()
 
-#include <mware/hashtable.h>
 
-#include "appconfig.h"
 
 #define ARG_SEP_S " "
 #define ARG_SEP_C ' '

diff --git a/bertos/mware/parser.h b/bertos/mware/parser.h
index b4e2f61d4382543553b5a6689c6d5d9c6987f773..ebfda20734b38d026d5ebd0c27b96495b485fc9f 100644 (file)
--- a/bertos/mware/parser.h
+++ b/bertos/mware/parser.h
@@ -40,10 +40,8 @@
  */
 
 
-#ifndef PARSER_H
-#define PARSER_H
-
-#include <drv/ser.h>
+#ifndef MWARE_PARSER_H
+#define MWARE_PARSER_H
 
 /** Max number of arguments and results for each command */
 #define PARSER_MAX_ARGS       8
@@ -181,5 +179,5 @@ bool parser_get_cmd_arguments(const char* line, const struct CmdTemplate* templ,
 bool parser_get_cmd_id(const char* line, unsigned long* ID);
 
 
-#endif /* PARSER_H */
+#endif /* MWARE_PARSER_H */
 

diff --git a/bertos/mware/readline.c b/bertos/mware/readline.c
index 4c3b3a81e5eb26fb266672a42f152a09b7dd9aca..83af2077a4200c9bbd47738fded826c130292ffa 100644 (file)
--- a/bertos/mware/readline.c
+++ b/bertos/mware/readline.c
@@ -75,8 +75,6 @@
 #include <cfg/debug.h>
 
 #include <stdio.h>
-#include <drv/ser.h>
-
 
 /// Enable compilation of the unit test code
 #define DEBUG_UNIT_TEST       0