arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

rename cbuf::getSize to cbuf::available (return available Bytes in cbuf)

Browse Source 
add cbuf::size (return size of cbuf)
This commit is contained in:
Markus Sattler 2016-01-26 18:13:33 +01:00
parent fa38ce4079
commit 531d748936
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cores/esp8266/HardwareSerial.cpp
View File

@ -643,7 +643,7 @@ int HardwareSerial::available(void) {
if (_uart != NULL && _uart->rxEnabled) { if (_uart != NULL && _uart->rxEnabled) {
InterruptLock il; InterruptLock il;
result = static_cast<int>(_rx_buffer->getSize()); result = static_cast<int>(_rx_buffer->available());
} }
if (!result) { if (!result) {
@ -696,7 +696,7 @@ void HardwareSerial::flush() {
while(true) { while(true) {
{ {
InterruptLock il; InterruptLock il;
if(_tx_buffer->getSize() == 0 && if(_tx_buffer->available() == 0 &&
UART_GET_TX_FIFO_ROOM(uart_nr) >= UART_TX_FIFO_SIZE) { UART_GET_TX_FIFO_ROOM(uart_nr) >= UART_TX_FIFO_SIZE) {
break; break;
} else if(il.savedInterruptLevel() > 0) { } else if(il.savedInterruptLevel() > 0) {
@ -750,7 +750,7 @@ void ICACHE_RAM_ATTR HardwareSerial::_rx_complete_irq(char c) {
void ICACHE_RAM_ATTR HardwareSerial::_tx_empty_irq(void) { void ICACHE_RAM_ATTR HardwareSerial::_tx_empty_irq(void) {
const int uart_nr = _uart->uart_nr; const int uart_nr = _uart->uart_nr;
size_t queued = _tx_buffer->getSize(); size_t queued = _tx_buffer->available();
if(!queued) { if(!queued) {
UART_DISARM_TX_INTERRUPT(uart_nr); UART_DISARM_TX_INTERRUPT(uart_nr);
return; return;

24
cores/esp8266/cbuf.cpp
View File

@ -35,11 +35,11 @@ size_t cbuf::resizeAdd(size_t addSize) {
size_t cbuf::resize(size_t newSize) { size_t cbuf::resize(size_t newSize) {
size_t available = getSize(); size_t bytes_available = available();
// not lose any data // not lose any data
// if data can be lost use remove or flush before resize // if data can be lost use remove or flush before resize
if((newSize < available) || (newSize == _size)) { if((newSize < bytes_available) || (newSize == _size)) {
return _size; return _size;
} }
@ -51,12 +51,12 @@ size_t cbuf::resize(size_t newSize) {
} }
if(_buf) { if(_buf) {
read(newbuf, available); read(newbuf, bytes_available);
memset((newbuf + available), 0x00, (newSize - available)); memset((newbuf + bytes_available), 0x00, (newSize - bytes_available));
} }
_begin = newbuf; _begin = newbuf;
_end = newbuf + available; _end = newbuf + bytes_available;
_bufend = newbuf + newSize; _bufend = newbuf + newSize;
_size = newSize; _size = newSize;
@ -66,13 +66,17 @@ size_t cbuf::resize(size_t newSize) {
return _size; return _size;
} }
size_t ICACHE_RAM_ATTR cbuf::getSize() const { size_t ICACHE_RAM_ATTR cbuf::available() const {
if(_end >= _begin) { if(_end >= _begin) {
return _end - _begin; return _end - _begin;
} }
return _size - (_begin - _end); return _size - (_begin - _end);
} }
size_t cbuf::size() {
return _size;
}
size_t cbuf::room() const { size_t cbuf::room() const {
if(_end >= _begin) { if(_end >= _begin) {
return _size - (_end - _begin) - 1; return _size - (_end - _begin) - 1;
@ -88,7 +92,7 @@ int cbuf::peek() {
} }
size_t cbuf::peek(char *dst, size_t size) { size_t cbuf::peek(char *dst, size_t size) {
size_t bytes_available = getSize(); size_t bytes_available = available();
size_t size_to_read = (size < bytes_available) ? size : bytes_available; size_t size_to_read = (size < bytes_available) ? size : bytes_available;
size_t size_read = size_to_read; size_t size_read = size_to_read;
char * begin = _begin; char * begin = _begin;
@ -113,7 +117,7 @@ int ICACHE_RAM_ATTR cbuf::read() {
} }
size_t cbuf::read(char* dst, size_t size) { size_t cbuf::read(char* dst, size_t size) {
size_t bytes_available = getSize(); size_t bytes_available = available();
size_t size_to_read = (size < bytes_available) ? size : bytes_available; size_t size_to_read = (size < bytes_available) ? size : bytes_available;
size_t size_read = size_to_read; size_t size_read = size_to_read;
if(_end < _begin && size_to_read > (size_t) (_bufend - _begin)) { if(_end < _begin && size_to_read > (size_t) (_bufend - _begin)) {
@ -159,7 +163,7 @@ void cbuf::flush() {
} }
size_t cbuf::remove(size_t size) { size_t cbuf::remove(size_t size) {
size_t bytes_available = getSize(); size_t bytes_available = available();
if(size >= bytes_available) { if(size >= bytes_available) {
flush(); flush();
return 0; return 0;
@ -171,5 +175,5 @@ size_t cbuf::remove(size_t size) {
size_to_remove -= top_size; size_to_remove -= top_size;
} }
_begin = wrap_if_bufend(_begin + size_to_remove); _begin = wrap_if_bufend(_begin + size_to_remove);
return getSize(); return available();
} }

3
cores/esp8266/cbuf.h
View File

@ -32,7 +32,8 @@ class cbuf {
size_t resizeAdd(size_t addSize); size_t resizeAdd(size_t addSize);
size_t resize(size_t newSize); size_t resize(size_t newSize);
size_t getSize() const; size_t available() const;
size_t size();
size_t room() const; size_t room() const;