djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp8266/uart: Comment out old, unused rx buffering code.

Browse Source 
This was originally used for non-event based REPL processing.  Then it
was unused when event-based processing was activated.  But now that event
based is disabled, and non-event based is back, there has been new ring
buffer code to process the chars.
This commit is contained in:
Damien George 2016-04-01 14:30:47 +03:00 committed by Paul Sokolovsky
parent fc4c43a72e
commit fb6cc96951
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
esp8266/uart.c
View File

@ -19,18 +19,22 @@
#include "user_interface.h" #include "user_interface.h"
#include "esp_mphal.h" #include "esp_mphal.h"
#define RX_BUF_SIZE (256)
#define UART_REPL UART0 #define UART_REPL UART0
// UartDev is defined and initialized in rom code. // UartDev is defined and initialized in rom code.
extern UartDevice UartDev; extern UartDevice UartDev;
/* unused
// circular buffer for RX buffering // circular buffer for RX buffering
#define RX_BUF_SIZE (256)
static uint16_t rx_buf_in; static uint16_t rx_buf_in;
static uint16_t rx_buf_out; static uint16_t rx_buf_out;
static uint8_t rx_buf[RX_BUF_SIZE]; static uint8_t rx_buf[RX_BUF_SIZE];
*/
#if MICROPY_REPL_EVENT_DRIVEN
static os_event_t uart_evt_queue[16]; static os_event_t uart_evt_queue[16];
#endif
static void uart0_rx_intr_handler(void *para); static void uart0_rx_intr_handler(void *para);
@ -83,9 +87,11 @@ static void ICACHE_FLASH_ATTR uart_config(uint8 uart_no) {
// enable rx_interrupt // enable rx_interrupt
SET_PERI_REG_MASK(UART_INT_ENA(uart_no), UART_RXFIFO_FULL_INT_ENA); SET_PERI_REG_MASK(UART_INT_ENA(uart_no), UART_RXFIFO_FULL_INT_ENA);
/* unused
// init RX buffer // init RX buffer
rx_buf_in = 0; rx_buf_in = 0;
rx_buf_out = 0; rx_buf_out = 0;
*/
} }
/****************************************************************************** /******************************************************************************
@ -184,6 +190,7 @@ static void uart0_rx_intr_handler(void *para) {
} }
} }
/* unused
int uart0_rx(void) { int uart0_rx(void) {
if (rx_buf_out != rx_buf_in) { if (rx_buf_out != rx_buf_in) {
int chr = rx_buf[rx_buf_out]; int chr = rx_buf[rx_buf_out];
@ -193,6 +200,7 @@ int uart0_rx(void) {
return -1; return -1;
} }
} }
*/
int uart_rx_one_char(uint8 uart_no) { int uart_rx_one_char(uint8 uart_no) {
if (READ_PERI_REG(UART_STATUS(uart_no)) & (UART_RXFIFO_CNT << UART_RXFIFO_CNT_S)) { if (READ_PERI_REG(UART_STATUS(uart_no)) & (UART_RXFIFO_CNT << UART_RXFIFO_CNT_S)) {