Diff: esp8266-driver/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp

Revision:

2:1dbc3aa8ae3a

Parent:

1:b4a718e62e0b

Child:

3:296161f9baf9

diff -r b4a718e62e0b -r 1dbc3aa8ae3a esp8266-driver/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp
--- a/esp8266-driver/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp	Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-/**
- * @file    BufferedSerial.cpp
- * @brief   Software Buffer - Extends mbed Serial functionallity adding irq driven TX and RX
- * @author  sam grove
- * @version 1.0
- * @see
- *
- * Copyright (c) 2013
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BufferedSerial.h"
-#include <stdarg.h>
-
-extern "C" int BufferedPrintfC(void *stream, int size, const char* format, va_list arg);
-
-BufferedSerial::BufferedSerial(PinName tx, PinName rx, uint32_t buf_size, uint32_t tx_multiple, const char* name)
-    : RawSerial(tx, rx) , _rxbuf(buf_size), _txbuf((uint32_t)(tx_multiple*buf_size))
-{
-    RawSerial::attach(this, &BufferedSerial::rxIrq, Serial::RxIrq);
-    this->_buf_size = buf_size;
-    this->_tx_multiple = tx_multiple;   
-    return;
-}
-
-BufferedSerial::~BufferedSerial(void)
-{
-    RawSerial::attach(NULL, RawSerial::RxIrq);
-    RawSerial::attach(NULL, RawSerial::TxIrq);
-
-    return;
-}
-
-int BufferedSerial::readable(void)
-{
-    return _rxbuf.available();  // note: look if things are in the buffer
-}
-
-int BufferedSerial::writeable(void)
-{
-    return 1;   // buffer allows overwriting by design, always true
-}
-
-int BufferedSerial::getc(void)
-{
-    return _rxbuf;
-}
-
-int BufferedSerial::putc(int c)
-{
-    _txbuf = (char)c;
-    BufferedSerial::prime();
-
-    return c;
-}
-
-int BufferedSerial::puts(const char *s)
-{
-    if (s != NULL) {
-        const char* ptr = s;
-    
-        while(*(ptr) != 0) {
-            _txbuf = *(ptr++);
-        }
-        _txbuf = '\n';  // done per puts definition
-        BufferedSerial::prime();
-    
-        return (ptr - s) + 1;
-    }
-    return 0;
-}
-
-extern "C" size_t BufferedSerialThunk(void *buf_serial, const void *s, size_t length)
-{
-    BufferedSerial *buffered_serial = (BufferedSerial *)buf_serial;
-    return buffered_serial->write(s, length);
-}
-
-int BufferedSerial::printf(const char* format, ...)
-{
-    va_list arg;
-    va_start(arg, format);
-    int r = BufferedPrintfC((void*)this, this->_buf_size, format, arg);
-    va_end(arg);
-    return r;
-}
-
-ssize_t BufferedSerial::write(const void *s, size_t length)
-{
-    if (s != NULL && length > 0) {
-        const char* ptr = (const char*)s;
-        const char* end = ptr + length;
-    
-        while (ptr != end) {
-            _txbuf = *(ptr++);
-        }
-        BufferedSerial::prime();
-    
-        return ptr - (const char*)s;
-    }
-    return 0;
-}
-
-
-void BufferedSerial::rxIrq(void)
-{
-    // read from the peripheral and make sure something is available
-    if(serial_readable(&_serial)) {
-        _rxbuf = serial_getc(&_serial); // if so load them into a buffer
-        // trigger callback if necessary
-        if (_cbs[RxIrq]) {
-            _cbs[RxIrq]();
-        }
-    }
-
-    return;
-}
-
-void BufferedSerial::txIrq(void)
-{
-    // see if there is room in the hardware fifo and if something is in the software fifo
-    while(serial_writable(&_serial)) {
-        if(_txbuf.available()) {
-            serial_putc(&_serial, (int)_txbuf.get());
-        } else {
-            // disable the TX interrupt when there is nothing left to send
-            RawSerial::attach(NULL, RawSerial::TxIrq);
-            // trigger callback if necessary
-            if (_cbs[TxIrq]) {
-                _cbs[TxIrq]();
-            }
-            break;
-        }
-    }
-
-    return;
-}
-
-void BufferedSerial::prime(void)
-{
-    // if already busy then the irq will pick this up
-    if(serial_writable(&_serial)) {
-        RawSerial::attach(NULL, RawSerial::TxIrq);    // make sure not to cause contention in the irq
-        BufferedSerial::txIrq();                // only write to hardware in one place
-        RawSerial::attach(this, &BufferedSerial::txIrq, RawSerial::TxIrq);
-    }
-
-    return;
-}
-
-void BufferedSerial::attach(Callback<void()> func, IrqType type)
-{
-    _cbs[type] = func;
-}
-