Diff: src/d7a_modem.cpp

Revision:

84:e5388f1b8ed9

Parent:

83:f4054d0b29ba

--- a/src/d7a_modem.cpp	Thu Jan 05 12:59:13 2017 +0000
+++ b/src/d7a_modem.cpp	Fri Jan 06 15:33:26 2017 +0000
@@ -8,6 +8,7 @@
 #include "d7a_common.h"
 #include "d7a.h"
 #include "d7a_alp.h"
+#include "d7a_typedefs.h"
 
 #if 1
     #define MODEM_DPRINT(...)       DPRINT(__VA_ARGS__)
@@ -21,17 +22,20 @@
 
 #define MODEM_TO    (20000)
 
-static Thread                       g_modem_thread(osPriorityHigh, 512, NULL);
-static Queue<void, 8>               g_modem_ready;
-static Queue<void, 2>               g_modem_boot;
-static Queue<d7a_com_rx_msg_t, 8>   g_modem_pkt_queue;
-static NotifDoneFunction            g_modem_notif_done;
-static PinName                      g_modem_reset_pin;
-static bool                         g_modem_booted;
+static NotifDoneFunction                g_modem_notif_done;
+static bool                             g_modem_booted;
+
+static MBED_PinName                     g_modem_reset_pin;
+
+static OS_Thread                        g_modem_thread(osPriorityHigh, 512, NULL);
+static OS_Queue<void, 8>                g_modem_ready;
+static OS_Queue<void, 2>                g_modem_boot;
+static OS_Queue<d7a_com_rx_msg_t, 8>    g_modem_pkt_queue;
+
 
 void d7a_modem_thread();
 
-d7a_errors_t d7a_modem_open(PinName reset_pin, NotifDoneFunction nd)
+d7a_errors_t d7a_modem_open(MBED_PinName reset_pin, NotifDoneFunction nd)
 {
     MODEM_FPRINT("\r\n");
     
@@ -108,7 +112,7 @@
     
     // Clean buffer and queues
     d7a_com_restart();
-    Thread::wait(100);
+    OS_Thread  ::wait(100);
     
     if (g_modem_reset_pin != NC)
     {   // Release reset