Diff: BufferedSerial.cpp

Revision:

6:8287e83943f0

Parent:

4:2ba4d2e1f05d

Child:

7:6fa214b41d73

--- a/BufferedSerial.cpp	Mon Mar 24 19:56:57 2014 +0000
+++ b/BufferedSerial.cpp	Tue Sep 09 20:20:38 2014 +0000
@@ -24,17 +24,17 @@
 #include <stdarg.h>
 
 BufferedSerial::BufferedSerial(PinName tx, PinName rx, const char* name)
-    : Serial(tx, rx, name)
+    : SERIAL_BASE(tx, rx)
 {
-    Serial::attach(this, &BufferedSerial::rxIrq, Serial::RxIrq);
+    SERIAL_BASE::attach(this, &BufferedSerial::rxIrq, Serial::RxIrq);
 
     return;
 }
 
 BufferedSerial::~BufferedSerial(void)
 {
-    Serial::attach(NULL, Serial::RxIrq);
-    Serial::attach(NULL, Serial::TxIrq);
+    SERIAL_BASE::attach(NULL, SERIAL_BASE::RxIrq);
+    SERIAL_BASE::attach(NULL, SERIAL_BASE::TxIrq);
 
     return;
 }
@@ -125,7 +125,7 @@
             serial_putc(&_serial, (int)_txbuf.get());
         } else {
             // disable the TX interrupt when there is nothing left to send
-            Serial::attach(NULL, Serial::TxIrq);
+            SERIAL_BASE::attach(NULL, SERIAL_BASE::TxIrq);
             break;
         }
     }
@@ -137,9 +137,9 @@
 {
     // if already busy then the irq will pick this up
     if(serial_writable(&_serial)) {
-        Serial::attach(NULL, Serial::TxIrq);    // make sure not to cause contention in the irq
+        SERIAL_BASE::attach(NULL, SERIAL_BASE::TxIrq);    // make sure not to cause contention in the irq
         BufferedSerial::txIrq();                // only write to hardware in one place
-        Serial::attach(this, &BufferedSerial::txIrq, Serial::TxIrq);
+        SERIAL_BASE::attach(this, &BufferedSerial::txIrq, SERIAL_BASE::TxIrq);
     }
 
     return;