X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fkeytag.c;h=dac1a11cb963582899f621c89fd2d1fcbbbc3d11;hb=41718ab2098bd5640da265c34f1ecb79a4123d39;hp=861169b488a9360561727e7e139def414d08cb4e;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/net/keytag.c b/bertos/net/keytag.c
index 861169b4..dac1a11c 100644
--- a/bertos/net/keytag.c
+++ b/bertos/net/keytag.c
@@ -31,8 +31,12 @@
  * -->
  *
  * \author Andrea Grandi <andrea@develer.com>
+ * \author Daniele Basile <asterix@develer.com>
  *
- * \brief Tag protocol (protocol).
+ * \brief KeyTAG parser.
+ *
+ * This module parse TAG message that come from comunication channel,
+ * and convert the tag value into string.
  *
  * TAG protocol is decribed in this way:
  * <pre>
@@ -44,13 +48,25 @@
 
 #include "keytag.h"
 
-#include <kern/kfile.h>
+#include <cfg/debug.h>
+// Define log settings for cfg/log.h
+#define LOG_LEVEL    CONFIG_KEYTAG_LOG_LEVEL
+#define LOG_FORMAT   CONFIG_KEYTAG_LOG_FORMAT
+#include <cfg/log.h>
+#include <cfg/macros.h>
 
-#include <drv/timer.h>
-#include <drv/ser.h>
+#include <io/kfile.h>
 
-#include <cfg/macros.h>
-#include <cfg/debug.h>
+#include <string.h>
+/**
+ * Starting communication char (STX).
+ */
+#define TAG_STX 0x02
+
+/**
+ * Ending communication char (ETX).
+ */
+#define TAG_ETX 0x03
 
 static void keytag_clearPkt(struct TagPacket *pkt)
 {
@@ -58,24 +74,37 @@ static void keytag_clearPkt(struct TagPacket *pkt)
 	pkt->len = 0;
 }
 
-	void keytag_init(struct TagPacket *pkt)
-	{
-		keytag_clearPkt(pkt);
-	}
+/**
+ * DEPRECATED FUCNTIONS
+ * To read the tag string from device you shoul use the keytag_recv
+ * fuction, that return the string if we had received it.
+ */
+void keytag_poll(struct TagPacket *pkt)
+{
+	uint8_t buf[CONFIG_TAG_MAX_LEN];
+	int len;
+	if ((len = keytag_recv(pkt, buf, sizeof(buf))) != EOF)
+		kfile_write(pkt->host, buf, len);
+}
 
-	void keytag_poll(struct TagPacket *pkt)
+/**
+ * Receive the tag message from channel, and if
+ * the tag is good put the converted string into given buffer.
+ * The fuction return the len of found tag string, otherwise EOF.
+ */
+int keytag_recv(struct TagPacket *pkt, uint8_t *tag, size_t len)
 {
 	int c;
 
 	/* Get all chars from buffer */
-	while ((c = kfile_getc(&pkt->tag_ser->fd)) != EOF)
+	while ((c = kfile_getc(pkt->tag)) != EOF)
 	{
 		/* Search for STX char in received chars */
 		if (c == TAG_STX)
 		{
 			/* When STX is found a new packet begins */
 			if (pkt->sync)
-				kprintf("TAG double sync!\n");
+				LOG_WARN("TAG double sync!\n");
 			keytag_clearPkt(pkt);
 			pkt->sync = true;
 		}
@@ -84,17 +113,20 @@ static void keytag_clearPkt(struct TagPacket *pkt)
 			/* Check for end of packet */
 			if (c == TAG_ETX)
 			{
-				pkt->buf[TAG_MAX_PRINT_CHARS] = '\x0';
-				/* Write read TAG on communication serial */
-				kfile_printf(&pkt->comm_ser->fd, "tag %s", pkt->buf);
+				/* Terminate the tag string */
+				size_t tag_len = MIN(len, pkt->len);
+
+				/* Save read tag */
+				memcpy(tag, pkt->buf, tag_len);
 				pkt->sync = false;
+				return tag_len;
 			}
 			else
 			{
 				/* Check for buffer overflow */
-				if (pkt->len >= TAG_MAX_LEN)
+				if (pkt->len >= CONFIG_TAG_MAX_LEN)
 				{
-					kprintf("TAG buffer overflow\n");
+					LOG_ERR("TAG buffer overflow\n");
 					pkt->sync = false;
 				}
 				else
@@ -109,4 +141,22 @@ static void keytag_clearPkt(struct TagPacket *pkt)
 			}
 		}
 	}
+	if (kfile_error(pkt->tag) != 0)
+	{
+		LOG_ERR("Error %04x\n", kfile_error(pkt->tag));
+		kfile_clearerr(pkt->tag);
+	}
+
+	return EOF;
 }
+
+/**
+ * Init the keytag module.
+ */
+void keytag_init(struct TagPacket *pkt, struct KFile *comm, struct KFile *tag)
+{
+	keytag_clearPkt(pkt);
+	pkt->tag = tag;
+	pkt->host = comm;
+}
+