arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Merge pull request #1213 from alltheblinkythings/cbuf_interrupts

Browse Source 
Interrupt safety fixes for HardwareSerial
This commit is contained in:
Ivan Grokhotkov 2015-12-14 12:45:22 +03:00
commit a73e1676b6
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cores/esp8266/HardwareSerial.cpp
View File

@ -29,6 +29,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "Arduino.h" #include "Arduino.h"
#include "cbuf.h" #include "cbuf.h"
#include "interrupts.h"
extern "C" { extern "C" {
#include "osapi.h" #include "osapi.h"
@ -556,6 +557,7 @@ int HardwareSerial::available(void) {
int result = 0; int result = 0;
if (_uart != NULL && _uart->rxEnabled) { if (_uart != NULL && _uart->rxEnabled) {
InterruptLock il;
result = static_cast<int>(_rx_buffer->getSize()); result = static_cast<int>(_rx_buffer->getSize());
} }
@ -570,6 +572,7 @@ int HardwareSerial::peek(void) {
if(_uart == 0) if(_uart == 0)
return -1; return -1;
if(_uart->rxEnabled) { if(_uart->rxEnabled) {
InterruptLock il;
return _rx_buffer->peek(); return _rx_buffer->peek();
} else { } else {
return -1; return -1;
@ -580,6 +583,7 @@ int HardwareSerial::read(void) {
if(_uart == 0) if(_uart == 0)
return -1; return -1;
if(_uart->rxEnabled) { if(_uart->rxEnabled) {
InterruptLock il;
return _rx_buffer->read(); return _rx_buffer->read();
} else { } else {
return -1; return -1;
@ -590,6 +594,7 @@ int HardwareSerial::availableForWrite(void) {
if(_uart == 0) if(_uart == 0)
return 0; return 0;
if(_uart->txEnabled) { if(_uart->txEnabled) {
InterruptLock il;
return static_cast<int>(_tx_buffer->room()); return static_cast<int>(_tx_buffer->room());
} else { } else {
return 0; return 0;
@ -604,9 +609,16 @@ void HardwareSerial::flush() {
if(!_written) if(!_written)
return; return;
while(_tx_buffer->getSize() || uart_get_tx_fifo_room(_uart) < UART_TX_FIFO_SIZE) while(true) {
{
InterruptLock il;
if(_tx_buffer->getSize() == 0 &&
uart_get_tx_fifo_room(_uart) >= UART_TX_FIFO_SIZE) {
break;
}
}
yield(); yield();
}
_written = false; _written = false;
} }
@ -614,18 +626,24 @@ size_t HardwareSerial::write(uint8_t c) {
if(_uart == 0 || !_uart->txEnabled) if(_uart == 0 || !_uart->txEnabled)
return 0; return 0;
_written = true; _written = true;
size_t room = uart_get_tx_fifo_room(_uart);
if(room > 0 && _tx_buffer->empty()) {
uart_transmit_char(_uart, c);
return 1;
}
while(_tx_buffer->room() == 0) { while(true) {
{
InterruptLock il;
if(_tx_buffer->empty()) {
if(uart_get_tx_fifo_room(_uart) > 0) {
uart_transmit_char(_uart, c);
} else {
_tx_buffer->write(c);
uart_arm_tx_interrupt(_uart);
}
break;
} else if(_tx_buffer->write(c)) {
break;
}
}
yield(); yield();
} }
_tx_buffer->write(c);
uart_arm_tx_interrupt(_uart);
return 1; return 1;
} }

4
cores/esp8266/cbuf.h
View File

@ -113,9 +113,9 @@ class cbuf {
return (ptr == _bufend) ? _buf : ptr; return (ptr == _bufend) ? _buf : ptr;
} }
size_t _size; const size_t _size;
char* _buf; char* _buf;
char* _bufend; const char* const _bufend;
char* _begin; char* _begin;
char* _end; char* _end;
}; };