Diff: BufferedSerial.cpp

Revision:

11:779304f9c5d2

Parent:

10:9ee15ae3d1a3

Child:

13:c17c532bc4f8

Child:

15:8bcd2a38302c

--- a/BufferedSerial.cpp	Wed Jan 07 18:37:11 2015 +0000
+++ b/BufferedSerial.cpp	Sun Jul 26 21:53:11 2015 +0000
@@ -24,9 +24,9 @@
 #include <stdarg.h>
 
 BufferedSerial::BufferedSerial(PinName tx, PinName rx, uint32_t buf_size, uint32_t tx_multiple, const char* name)
-    : SERIAL_BASE(tx, rx) , _rxbuf(buf_size), _txbuf((uint32_t)(tx_multiple*buf_size))
+    : RawSerial(tx, rx) , _rxbuf(buf_size), _txbuf((uint32_t)(tx_multiple*buf_size))
 {
-    SERIAL_BASE::attach(this, &BufferedSerial::rxIrq, Serial::RxIrq);
+    RawSerial::attach(this, &BufferedSerial::rxIrq, Serial::RxIrq);
     this->_buf_size = buf_size;
     this->_tx_multiple = tx_multiple;   
     return;
@@ -34,8 +34,8 @@
 
 BufferedSerial::~BufferedSerial(void)
 {
-    SERIAL_BASE::attach(NULL, SERIAL_BASE::RxIrq);
-    SERIAL_BASE::attach(NULL, SERIAL_BASE::TxIrq);
+    RawSerial::attach(NULL, RawSerial::RxIrq);
+    RawSerial::attach(NULL, RawSerial::TxIrq);
 
     return;
 }
@@ -135,7 +135,7 @@
             serial_putc(&_serial, (int)_txbuf.get());
         } else {
             // disable the TX interrupt when there is nothing left to send
-            SERIAL_BASE::attach(NULL, SERIAL_BASE::TxIrq);
+            RawSerial::attach(NULL, RawSerial::TxIrq);
             break;
         }
     }
@@ -147,9 +147,9 @@
 {
     // if already busy then the irq will pick this up
     if(serial_writable(&_serial)) {
-        SERIAL_BASE::attach(NULL, SERIAL_BASE::TxIrq);    // make sure not to cause contention in the irq
+        RawSerial::attach(NULL, RawSerial::TxIrq);    // make sure not to cause contention in the irq
         BufferedSerial::txIrq();                // only write to hardware in one place
-        SERIAL_BASE::attach(this, &BufferedSerial::txIrq, SERIAL_BASE::TxIrq);
+        RawSerial::attach(this, &BufferedSerial::txIrq, RawSerial::TxIrq);
     }
 
     return;