542c2b93d0
This change introduces console_getchar() and console_getline() API calls which can be used to get pending console input (either one char or whole line), or block waiting for one. In this regard, they are similar to well-known ANSI C function getchar/gets/fgets, and are intended to ease porting of existing applications to Zephyr, and indeed, these functions (shaped as an external module) are already used by few applications. The implementation of the functions is structured as a new "console" subsystem. The intention is that further generic console code may be pulled there instead of being in drivers/console/. Besides the functions themselves, initialization code and sample applications are included. At this time, there're may limitations of how these functions can be used. For example, console_getchar() and console_getline() are mutually exclusive, and both are incompatible with callback (push-style) console API (and e.g. with console shell subsystem which uses this API). Again, the intention is to make a first step towards refactoring console subsystem to allow more flexible real-world usage, better reusability and composability. Change-Id: I3f4015bb5b26e0656f82f428b11ba30e980d25a0 Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
57 lines
1.2 KiB
C
57 lines
1.2 KiB
C
/*
|
|
* Copyright (c) 2017 Linaro Limited.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr.h>
|
|
#include <uart.h>
|
|
#include <misc/printk.h>
|
|
#include <drivers/console/console.h>
|
|
#include <drivers/console/uart_console.h>
|
|
|
|
#if CONFIG_CONSOLE_GETCHAR_BUFSIZE & (CONFIG_CONSOLE_GETCHAR_BUFSIZE - 1) != 0
|
|
#error CONFIG_CONSOLE_GETCHAR_BUFSIZE must be power of 2
|
|
#endif
|
|
|
|
static K_SEM_DEFINE(uart_sem, 0, UINT_MAX);
|
|
static uint8_t uart_ringbuf[CONFIG_CONSOLE_GETCHAR_BUFSIZE];
|
|
static uint8_t i_get, i_put;
|
|
|
|
static int console_irq_input_hook(uint8_t c)
|
|
{
|
|
int i_next = (i_put + 1) & (CONFIG_CONSOLE_GETCHAR_BUFSIZE - 1);
|
|
|
|
if (i_next == i_get) {
|
|
printk("Console buffer overflow - char dropped\n");
|
|
return 1;
|
|
}
|
|
|
|
uart_ringbuf[i_put] = c;
|
|
i_put = i_next;
|
|
k_sem_give(&uart_sem);
|
|
|
|
return 1;
|
|
}
|
|
|
|
uint8_t console_getchar(void)
|
|
{
|
|
unsigned int key;
|
|
uint8_t c;
|
|
|
|
k_sem_take(&uart_sem, K_FOREVER);
|
|
key = irq_lock();
|
|
c = uart_ringbuf[i_get++];
|
|
i_get &= CONFIG_CONSOLE_GETCHAR_BUFSIZE - 1;
|
|
irq_unlock(key);
|
|
|
|
return c;
|
|
}
|
|
|
|
void console_getchar_init(void)
|
|
{
|
|
uart_console_in_debug_hook_install(console_irq_input_hook);
|
|
/* All NULLs because we're interested only in the callback above. */
|
|
uart_register_input(NULL, NULL, NULL);
|
|
}
|