Revision 11:779304f9c5d2, committed 2015-07-26

Comitter:

sam_grove

Date:

Sun Jul 26 21:53:11 2015 +0000

Parent:

10:9ee15ae3d1a3

Child:

12:a0d37088b405

Commit message:

Force use of RawSerial

Changed in this revision

--- 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;

--- a/BufferedSerial.h	Wed Jan 07 18:37:11 2015 +0000
+++ b/BufferedSerial.h	Sun Jul 26 21:53:11 2015 +0000
@@ -27,9 +27,6 @@
 #include "mbed.h"
 #include "Buffer.h"
 
-// Base Class
-#define SERIAL_BASE  RawSerial
-
 /** A serial port (UART) for communication with other serial devices
  *
  * Can be used for Full Duplex communication, or Simplex by specifying
@@ -71,7 +68,7 @@
  *  @class BufferedSerial
  *  @brief Software buffers and interrupt driven tx and rx for Serial
  */  
-class BufferedSerial : public SERIAL_BASE 
+class BufferedSerial : public RawSerial 
 {
 private:
     Buffer <char> _rxbuf;