TBM/tbm-mcu
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

usart: remove old usart code

Browse source
This commit is contained in:
S.J.R. van Schaik 2017-08-01 16:55:42 +02:00
parent 9f5afa977e
commit 81b475c334
2 changed files with 4 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
source/platform/stm32f0/usart.c
View file

@ -56,20 +56,6 @@ void usart2_isr(void)
usart_isr(usart + 1); usart_isr(usart + 1);
} }
static char usart_getc(struct usart_console *console, int block)
{
char c = 0;
while (block && (console->cur == console->next));
if (console->cur != console->next) {
c = console->recv_buf[console->cur];
console->cur = (console->cur + 1) % RECV_BUF_LEN;
}
return c;
}
int console_peek(char *c, struct console *console_, int block) int console_peek(char *c, struct console *console_, int block)
{ {
struct usart_console *console = container_of(console_, struct usart_console *console = container_of(console_,
@ -197,49 +183,6 @@ out:
return p - buf; return p - buf;
} }
static ssize_t usart_read(void *cookie, char *buf, size_t n)
{
struct usart_console *console = cookie;
char *p = buf;
char c;
*buf = '\0';
while ((c = usart_getc(console, 1)) != '\r') {
switch (c) {
case 10:
case 127:
if (buf < p) {
usart_send_blocking(console->dev, '\010');
usart_send_blocking(console->dev, ' ');
usart_send_blocking(console->dev, '\010');
--p;
}
break;
default:
*p = c;
usart_send_blocking(console->dev, c);
if (((size_t)p - (size_t)buf) < n) {
++p;
}
}
*p = '\0';
}
*p = '\n';
if (((size_t)p - (size_t)buf) < n) {
++p;
}
*p = '\0';
return p - buf;
}
static ssize_t usart_write(void *cookie, const char *buf, size_t n) static ssize_t usart_write(void *cookie, const char *buf, size_t n)
{ {
struct usart_console *console = cookie; struct usart_console *console = cookie;
@ -291,7 +234,7 @@ static int usart_init(struct usart_console *console)
struct console *console_init(unsigned dev_id) struct console *console_init(unsigned dev_id)
{ {
cookie_io_functions_t fops = { cookie_io_functions_t fops = {
.read = usart_read, .read = NULL,
.write = usart_write, .write = usart_write,
.seek = NULL, .seek = NULL,
.close = NULL, .close = NULL,
@ -311,7 +254,7 @@ struct console *console_init(unsigned dev_id)
usart_init(console); usart_init(console);
console->console.fp = fopencookie(console, "r+w", fops); console->console.fp = fopencookie(console, "w", fops);
setvbuf(console->console.fp, NULL, _IONBF, 0); setvbuf(console->console.fp, NULL, _IONBF, 0);
return &console->console; return &console->console;

61
source/platform/stm32f1/usart.c
View file

@ -56,20 +56,6 @@ void usart2_isr(void)
usart_isr(usart + 1); usart_isr(usart + 1);
} }
static char usart_getc(struct usart_console *console, int block)
{
char c = 0;
while (block && (console->cur == console->next));
if (console->cur != console->next) {
c = console->recv_buf[console->cur];
console->cur = (console->cur + 1) % RECV_BUF_LEN;
}
return c;
}
int console_peek(char *c, struct console *console_, int block) int console_peek(char *c, struct console *console_, int block)
{ {
struct usart_console *console = container_of(console_, struct usart_console *console = container_of(console_,
@ -197,49 +183,6 @@ out:
return p - buf; return p - buf;
} }
static ssize_t usart_read(void *cookie, char *buf, size_t n)
{
struct usart_console *console = cookie;
char *p = buf;
char c;
*buf = '\0';
while ((c = usart_getc(console, 1)) != '\r') {
switch (c) {
case 10:
case 127:
if (buf < p) {
usart_send_blocking(console->dev, '\010');
usart_send_blocking(console->dev, ' ');
usart_send_blocking(console->dev, '\010');
--p;
}
break;
default:
*p = c;
usart_send_blocking(console->dev, c);
if (((size_t)p - (size_t)buf) < n) {
++p;
}
}
*p = '\0';
}
*p = '\n';
if (((size_t)p - (size_t)buf) < n) {
++p;
}
*p = '\0';
return p - buf;
}
static ssize_t usart_write(void *cookie, const char *buf, size_t n) static ssize_t usart_write(void *cookie, const char *buf, size_t n)
{ {
struct usart_console *console = cookie; struct usart_console *console = cookie;
@ -291,7 +234,7 @@ static int usart_init(struct usart_console *console)
struct console *console_init(unsigned dev_id) struct console *console_init(unsigned dev_id)
{ {
cookie_io_functions_t fops = { cookie_io_functions_t fops = {
.read = usart_read, .read = NULL,
.write = usart_write, .write = usart_write,
.seek = NULL, .seek = NULL,
.close = NULL, .close = NULL,
@ -311,7 +254,7 @@ struct console *console_init(unsigned dev_id)
usart_init(console); usart_init(console);
console->console.fp = fopencookie(console, "r+w", fops); console->console.fp = fopencookie(console, "w", fops);
setvbuf(console->console.fp, NULL, _IONBF, 0); setvbuf(console->console.fp, NULL, _IONBF, 0);
return &console->console; return &console->console;