projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add clear hook. Refactor.
[bertos.git]
/
net
/
keytag.c
diff --git
a/net/keytag.c
b/net/keytag.c
index afc21b183ed2e0ebf7632f834b2d80727c449b93..861169b488a9360561727e7e139def414d08cb4e 100644
(file)
--- a/
net/keytag.c
+++ b/
net/keytag.c
@@
-44,6
+44,8
@@
#include "keytag.h"
#include "keytag.h"
+#include <kern/kfile.h>
+
#include <drv/timer.h>
#include <drv/ser.h>
#include <drv/timer.h>
#include <drv/ser.h>
@@
-56,17
+58,17
@@
static void keytag_clearPkt(struct TagPacket *pkt)
pkt->len = 0;
}
pkt->len = 0;
}
-void keytag_init(struct TagPacket *pkt)
-{
- keytag_clearPkt(pkt);
-}
+
void keytag_init(struct TagPacket *pkt)
+
{
+
keytag_clearPkt(pkt);
+
}
-void keytag_poll(struct TagPacket *pkt)
+
void keytag_poll(struct TagPacket *pkt)
{
int c;
/* Get all chars from buffer */
{
int c;
/* Get all chars from buffer */
- while ((c =
ser_getchar_nowait(pkt->tag_ser
)) != EOF)
+ while ((c =
kfile_getc(&pkt->tag_ser->fd
)) != EOF)
{
/* Search for STX char in received chars */
if (c == TAG_STX)
{
/* Search for STX char in received chars */
if (c == TAG_STX)
@@
-84,7
+86,7
@@
void keytag_poll(struct TagPacket *pkt)
{
pkt->buf[TAG_MAX_PRINT_CHARS] = '\x0';
/* Write read TAG on communication serial */
{
pkt->buf[TAG_MAX_PRINT_CHARS] = '\x0';
/* Write read TAG on communication serial */
-
ser_printf(pkt->comm_ser
, "tag %s", pkt->buf);
+
kfile_printf(&pkt->comm_ser->fd
, "tag %s", pkt->buf);
pkt->sync = false;
}
else
pkt->sync = false;
}
else