From 81b475c33461f2d974ba9be698c2188ad4598bb3 Mon Sep 17 00:00:00 2001 From: "S.J.R. van Schaik" Date: Tue, 1 Aug 2017 16:55:42 +0200 Subject: [PATCH] usart: remove old usart code --- source/platform/stm32f0/usart.c | 61 ++--------------------------------------- source/platform/stm32f1/usart.c | 61 ++--------------------------------------- 2 files changed, 4 insertions(+), 118 deletions(-) diff --git a/source/platform/stm32f0/usart.c b/source/platform/stm32f0/usart.c index 4ea510d..8c4c884 100644 --- a/source/platform/stm32f0/usart.c +++ b/source/platform/stm32f0/usart.c @@ -56,20 +56,6 @@ void usart2_isr(void) 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) { struct usart_console *console = container_of(console_, @@ -197,49 +183,6 @@ out: 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) { struct usart_console *console = cookie; @@ -291,7 +234,7 @@ static int usart_init(struct usart_console *console) struct console *console_init(unsigned dev_id) { cookie_io_functions_t fops = { - .read = usart_read, + .read = NULL, .write = usart_write, .seek = NULL, .close = NULL, @@ -311,7 +254,7 @@ struct console *console_init(unsigned dev_id) 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); return &console->console; diff --git a/source/platform/stm32f1/usart.c b/source/platform/stm32f1/usart.c index f3182ae..66a27f3 100644 --- a/source/platform/stm32f1/usart.c +++ b/source/platform/stm32f1/usart.c @@ -56,20 +56,6 @@ void usart2_isr(void) 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) { struct usart_console *console = container_of(console_, @@ -197,49 +183,6 @@ out: 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) { struct usart_console *console = cookie; @@ -291,7 +234,7 @@ static int usart_init(struct usart_console *console) struct console *console_init(unsigned dev_id) { cookie_io_functions_t fops = { - .read = usart_read, + .read = NULL, .write = usart_write, .seek = NULL, .close = NULL, @@ -311,7 +254,7 @@ struct console *console_init(unsigned dev_id) 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); return &console->console;