Diff: XBee.cpp

Revision:

4:c05dc188f177

Parent:

3:8453df14bd30

Child:

8:776b8dc51932

--- a/XBee.cpp	Thu Sep 20 10:50:00 2012 +0000
+++ b/XBee.cpp	Mon Nov 26 01:52:03 2012 +0000
@@ -26,28 +26,28 @@
         : Serial(ser), mon(USBTX, USBRX), leds(LED1, LED2, LED3, LED4), apiMode(apiMode),
         state(UNKNOWN), in(0), out(0), received(-1), free(BUFSIZE), frame_id(1), debug(debug) {
     memset(buf, 0, BUFSIZE);
-    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, Serial::RxIrq);
+    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, RxIrq);
 }
 
 XBee::XBee(PinName tx, PinName rx, int apiMode, bool debug)
         : Serial(tx, rx), mon(USBTX, USBRX), leds(LED1, LED2, LED3, LED4), apiMode(apiMode),
         state(UNKNOWN), in(0), out(0), received(-1), free(BUFSIZE), frame_id(1), debug(debug) {
     memset(buf, 0, BUFSIZE);
-    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, Serial::RxIrq);
+    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, RxIrq);
 }
 
 XBee::XBee(Serial& ser, Serial& mon, int apiMode, bool debug)
         : Serial(ser), mon(mon), leds(LED1, LED2, LED3, LED4), apiMode(apiMode),
         state(UNKNOWN), in(0), out(0), received(-1), free(BUFSIZE), frame_id(1), debug(debug) {
     memset(buf, 0, BUFSIZE);
-    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, Serial::RxIrq);
+    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, RxIrq);
 }
 
 XBee::XBee(PinName tx, PinName rx, Serial& mon, int apiMode, bool debug)
         : Serial(tx, rx), mon(mon), leds(LED1, LED2, LED3, LED4), apiMode(apiMode),
         state(UNKNOWN), in(0), out(0), received(-1), free(BUFSIZE), frame_id(1), debug(debug) {
     memset(buf, 0, BUFSIZE);
-    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, Serial::RxIrq);
+    attach(this, apiMode == 1 ? &XBee::rxInterruptHandler : &XBee::rxInterruptHandler2, RxIrq);
 }
 
 bool XBee::init(float timeout) {