Diff: nsdl_support.cpp

Revision:

3:30c96bd77160

Parent:

1:9824f99868a3

--- a/nsdl_support.cpp	Fri Sep 19 05:24:41 2014 +0000
+++ b/nsdl_support.cpp	Fri Sep 26 05:55:55 2014 +0000
@@ -2,9 +2,9 @@
 
 #include "mbed.h"
 #include "nsdl_support.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 
-extern ErrorHandler *error_handler;
+extern Logger *m_logger;
 #ifdef NETWORK_MUTEX
 extern Mutex *network_mutex;
 #endif
@@ -94,15 +94,15 @@
 }
 
 static uint8_t tx_cb(sn_nsdl_capab_e protocol, uint8_t *data_ptr, uint16_t data_len, sn_nsdl_addr_s *address_ptr) {
-    //if (error_handler != NULL) error_handler->log("NSP: sending %d bytes...",data_len);
+    //if (m_logger != NULL) m_logger->log("NSP: sending %d bytes...",data_len);
     int sent = server.sendTo(nsp, (char*)data_ptr, data_len);
 
-    //if (error_handler != NULL) error_handler->log("NSP: send done. sent %d bytes...",sent);
+    //if (m_logger != NULL) m_logger->log("NSP: send done. sent %d bytes...",sent);
     if (sent != data_len) {
-       if (error_handler != NULL) error_handler->log("NSP: send failed!! Attempted: %d Sent: %d", data_len, sent);
+       if (m_logger != NULL) m_logger->log("NSP: send failed!! Attempted: %d Sent: %d", data_len, sent);
     }
     else {
-       if (error_handler != NULL) error_handler->blinkTransportTxLED();
+       if (m_logger != NULL) m_logger->blinkTransportTxLED();
     }
 
     return 1;
@@ -110,7 +110,7 @@
 
 static uint8_t rx_cb(sn_coap_hdr_s *coap_packet_ptr, sn_nsdl_addr_s *address_ptr) {
     // Rx callback process it...
-    if (error_handler != NULL) error_handler->blinkTransportRxLED();
+    if (m_logger != NULL) m_logger->blinkTransportRxLED();
     return 0;
 }
 
@@ -135,19 +135,19 @@
         if (count%registration_time == 0) {
             // re-registration time!
             count = 0;
-            if (error_handler != NULL) error_handler->log("NSP: (re)registering...");
+            if (m_logger != NULL) m_logger->log("NSP: (re)registering...");
             register_endpoint(false);
-            if (error_handler != NULL) error_handler->log("NSP: (re)registering complete.");
+            if (m_logger != NULL) m_logger->log("NSP: (re)registering complete.");
         }
         else {
             if (count%RD_UPDATE_PERIOD == 0) {
                 if (endpoint != NULL) endpoint->sendObservations();
             }
-            if (error_handler != NULL) {
-                 error_handler->checkForExit();
+            if (m_logger != NULL) {
+                 m_logger->checkForExit();
             }
         }
-        if (error_handler != NULL) error_handler->blinkTransportRxLED();
+        if (m_logger != NULL) m_logger->blinkTransportRxLED();
     }
 }
 
@@ -161,10 +161,10 @@
     memory_cbs.sn_nsdl_alloc = &nsdl_alloc;
     memory_cbs.sn_nsdl_free = &nsdl_free;
     if(sn_nsdl_init(&tx_cb, &rx_cb, &memory_cbs) == -1) {
-        if (error_handler != NULL) error_handler->log("NSP: libNsdl init failed");
+        if (m_logger != NULL) m_logger->log("NSP: libNsdl init failed");
     }
     else {
-        if (error_handler != NULL) error_handler->log("NSP: libNsdl init successful");
+        if (m_logger != NULL) m_logger->log("NSP: libNsdl init successful");
     }
 
     /* Set nsp address for library */
@@ -189,14 +189,14 @@
     
     // FOREVER: main loop for event processing  
     while(true) {        
-        //if (error_handler != NULL) error_handler->log("NSP: waiting for data...");
+        //if (m_logger != NULL) m_logger->log("NSP: waiting for data...");
         int n = server.receiveFrom(from,nsp_buffer,sizeof(nsp_buffer));
 
-        //if (error_handler != NULL) error_handler->log("NSP: received %d bytes... processing...",n);
+        //if (m_logger != NULL) m_logger->log("NSP: received %d bytes... processing...",n);
         if (n >= 0) sn_nsdl_process_coap((uint8_t*)nsp_buffer,n,&received_packet_address);
         
-        //if (error_handler != NULL) error_handler->log("NSP: done processing %d bytes...",n);
-        if (error_handler != NULL) error_handler->blinkTransportRxLED();
+        //if (m_logger != NULL) m_logger->log("NSP: done processing %d bytes...",n);
+        if (m_logger != NULL) m_logger->blinkTransportRxLED();
 
         // perform any extra event loop work
         if (endpoint != NULL) endpoint->extraEventLoopWork();