deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GNU/Linux: Fix the example to cancel the input on timeout.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka
2021-02-10 10:18:42 +09:00
parent c1433f1520
commit b491d815e5
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2021-02-10 NIIBE Yutaka <gniibe@fsij.org>
* example-cdc-gnu-linux/usb-cdc.c (tty_recv): Cancel the input.
* chopstx.c (chx_recv_irq): Bug fix when no waiter.
* chopstx-gnu-linux.c (chopstx_create_arch): Fix ARGC of

2
chopstx-gnu-linux.c
View File

@@ -176,7 +176,7 @@ chx_idle (void)
else
{
tp_next = chx_recv_irq (sig);
/* Exit when there is no waiter and it's INT or TERM. */
/* Exit when there is no waiter and it's INT or TERM. */
if (tp_next == NULL
&& (sig == SIGINT || sig == SIGTERM))
exit (1);

12
example-cdc-gnu-linux/sample.c
View File

@@ -180,12 +180,12 @@ main (int argc, const char *argv[])
goto connection_loop;
if (size == 0)
/* Timeout */
{
if (tty_send (tty, "\r\n", 2) < 0)
return 0;
break;
}
/* Timeout */
{
if (tty_send (tty, "\r\n", 2) < 0)
return 0;
break;
}
else if (size == 1)
/* Do nothing but prompt again. */
break;

12
example-cdc-gnu-linux/usb-cdc.c
View File

@@ -905,7 +905,17 @@ tty_recv (struct tty *t, char *buf, uint32_t *timeout)
r = check_rx (t);
chopstx_mutex_unlock (&t->mtx);
if (r || (timeout != NULL && *timeout == 0))
break;
{
/* Cancel the input. */
for (i = 0; i < t->inputline_len; i++)
{
tty_echo_char (t, 0x08);
tty_echo_char (t, 0x20);
tty_echo_char (t, 0x08);
}
t->inputline_len = 0;
break;
}
}
chopstx_mutex_lock (&t->mtx);