From eeb354119c0304c935095bed5fc155aa67f7250b Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 23 May 2016 17:42:21 +0900
Subject: Change example-cdc
---
example-cdc/sample.c | 4 +++-
example-cdc/usb-cdc.c | 9 ++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
(limited to 'example-cdc')
diff --git a/example-cdc/sample.c b/example-cdc/sample.c
index 3de26c7..cb6c5ae 100644
--- a/example-cdc/sample.c
+++ b/example-cdc/sample.c
@@ -142,8 +142,10 @@ main (int argc, const char *argv[])
if (size < 0)
break;
- if (usec)
+ if (size)
{
+ size--;
+
s[0] = hexchar (size >> 4);
s[1] = hexchar (size & 0x0f);
s[2] = ':';
diff --git a/example-cdc/usb-cdc.c b/example-cdc/usb-cdc.c
index 7199ab6..b3e7598 100644
--- a/example-cdc/usb-cdc.c
+++ b/example-cdc/usb-cdc.c
@@ -548,6 +548,7 @@ tty_input_char (struct tty *t, int c)
switch (c)
{
case 0x0d: /* Control-M */
+ t->inputline[t->inputline_len++] = '\n';
tty_echo_char (t, 0x0d);
tty_echo_char (t, 0x0a);
t->flag_input_avail = 1;
@@ -581,7 +582,7 @@ tty_input_char (struct tty *t, int c)
}
break;
default:
- if (t->inputline_len < sizeof (t->inputline))
+ if (t->inputline_len < sizeof (t->inputline) - 1)
{
tty_echo_char (t, c);
t->inputline[t->inputline_len++] = c;
@@ -791,6 +792,12 @@ check_rx (void *arg)
return 0;
}
+/*
+ * Returns -1 on connection close
+ * 0 on timeout.
+ * >0 length of the inputline (including final \n)
+ *
+ */
int
tty_recv (struct tty *t, uint8_t *buf, uint32_t *timeout)
{
--
cgit v1.2.3