Cellular: Fix ATHandler string handling

Author: Ari Parkkila

features/cellular/framework/AT/ATHandler.cpp

@@ -633,6 +633,9 @@ ssize_t ATHandler::read_string(char *buf, size_t size, bool read_even_stop_tag)
             }
         } else if (match_pos) {
             match_pos = 0;
+            if (c == _stop_tag->tag[match_pos]) {
+                match_pos++;
+            }
         }
 
         buf[len] = c;
@@ -1605,12 +1608,14 @@ void ATHandler::write_hex_string(char *str, size_t size)
         return;
     }
 
+    (void) write("\"", 1);
     char hexbuf[2];
     for (size_t i = 0; i < size; i++) {
         hexbuf[0] = hex_values[((str[i]) >> 4) & 0x0F];
         hexbuf[1] = hex_values[(str[i]) & 0x0F];
         write(hexbuf, 2);
     }
+    (void) write("\"", 1);
 }
 
 void ATHandler::set_baud(int baud_rate)

features/frameworks/greentea-client/greentea-client/greentea_serial.h

@@ -8,10 +8,16 @@
 
 #include "RawSerial.h"
 #include "SingletonPtr.h"
+#include "PlatformMutex.h"
 
 class GreenteaSerial : public mbed::RawSerial {
 public:
     GreenteaSerial();
+    void set_trace_mutex(PlatformMutex *trace_mutex);
+    void lock_trace();
+    void unlock_trace();
+private:
+    PlatformMutex *_trace_mutex;
 };
 
 extern SingletonPtr<GreenteaSerial> greentea_serial;

features/frameworks/greentea-client/source/greentea_serial.cpp

@@ -14,7 +14,6 @@
 
 SingletonPtr<GreenteaSerial> greentea_serial;
 
-GreenteaSerial::GreenteaSerial() : mbed::RawSerial(USBTX, USBRX, MBED_CONF_PLATFORM_STDIO_BAUD_RATE) {
 #if   CONSOLE_FLOWCONTROL == CONSOLE_FLOWCONTROL_RTS
     set_flow_control(SerialBase::RTS, STDIO_UART_RTS, NC);
 #elif CONSOLE_FLOWCONTROL == CONSOLE_FLOWCONTROL_CTS
@@ -24,4 +23,19 @@ GreenteaSerial::GreenteaSerial() : mbed::RawSerial(USBTX, USBRX, MBED_CONF_PLATF
 #endif
 }
 
+void GreenteaSerial::set_trace_mutex(PlatformMutex *trace_mutex) {
+	_trace_mutex = trace_mutex;
+}
+
+void GreenteaSerial::lock_trace() {
+    if (_trace_mutex) {
+    	_trace_mutex->lock();
+    }
+}
+
+void GreenteaSerial::unlock_trace() {
+    if (_trace_mutex) {
+    	_trace_mutex->unlock();
+    }
+}
 #endif

features/frameworks/greentea-client/source/greentea_test_env.cpp

@@ -221,6 +221,8 @@ void greentea_notify_coverage_end() {
  */
 inline void greentea_write_preamble()
 {
+	greentea_serial->lock_trace();
+
     greentea_serial->putc('{');
     greentea_serial->putc('{');
 }
@@ -243,6 +245,8 @@ inline void greentea_write_postamble()
     greentea_serial->putc('}');
     greentea_serial->putc('\r');
     greentea_serial->putc('\n');
+
+    greentea_serial->unlock_trace();
 }
 
 /**