Replace RawSerial instances as it has been deprecated

Author: hugueskamba

TEST_APPS/device/nanostack_mac_tester/main.cpp

@@ -44,7 +44,7 @@
 #endif
 
 extern mac_api_s *mac_interface;
-RawSerial pc(USBTX, USBRX);
+UnbufferedSerial pc(USBTX, USBRX);
 osThreadId_t main_thread;
 static CircularBuffer<uint8_t, RX_BUFFER_SIZE> rx_buffer;
 static uint8_t ns_heap[HEAP_FOR_MAC_TESTER_SIZE];
@@ -68,7 +68,8 @@ static void app_heap_error_handler(heap_fail_t event)
 
 static void rx_interrupt(void)
 {
-    uint8_t c = pc.getc();
+    uint8_t c;
+    pc.read(&c, 1);
     rx_buffer.push(c);
     if (main_thread != NULL) {
         osThreadFlagsSet(main_thread, 1);

drivers/RawSerial.h

@@ -27,9 +27,6 @@
 #include <cstdarg>
 
 namespace mbed {
-/** \defgroup drivers-public-api-uart UART
- * \ingroup drivers-public-api
- */
 
 /**
  * \defgroup drivers_RawSerial RawSerial class

drivers/UnbufferedSerial.h

@@ -30,6 +30,9 @@
 
 
 namespace mbed {
+/** \defgroup drivers-public-api-uart UART
+ * \ingroup drivers-public-api
+ */
 
 /**
  * \defgroup drivers_UnbufferedSerial UnbufferedSerial class

features/FEATURE_BLE/targets/TARGET_CORDIO/driver/H4TransportDriver.h

@@ -69,11 +69,9 @@ class H4TransportDriver : public CordioHCITransportDriver {
 private:
     void on_controller_irq();
 
-    // Use RawSerial as opposed to Serial as we don't require the locking primitives
-    // provided by the Serial class (access to the UART should be exclusive to this driver)
-    // Furthermore, we access the peripheral in interrupt context which would clash
-    // with Serial's locking facilities
-    RawSerial uart;
+    // Use UnbufferedSerial as we don't require locking primitives.
+    // We access the peripheral in interrupt context.
+    UnbufferedSerial uart;
     PinName cts;
     PinName rts;
 };

features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/CyH4TransportDriver.h

@@ -82,11 +82,9 @@ class CyH4TransportDriver : public cordio::CordioHCITransportDriver {
     void assert_bt_dev_wake();
     void deassert_bt_dev_wake();
 
-    // Use RawSerial as opposed to Serial as we don't require the locking primitives
-    // provided by the Serial class (access to the UART should be exclusive to this driver)
-    // Furthermore, we access the peripheral in interrupt context which would clash
-    // with Serial's locking facilities
-    RawSerial uart;
+    // Use UnbufferedSerial as we don't require locking primitives.
+    // We access the peripheral in interrupt context.
+    UnbufferedSerial uart;
     PinName cts;
     PinName rts;
     PinName bt_host_wake_name;

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

@@ -117,6 +117,7 @@ void greentea_send_kv(const char * key, const char * val);
 int greentea_parse_kv(char * key, char * val,
                         const int key_len, const int val_len);
 int greentea_getc();
+int greentea_putc(int c);
 
 #ifdef __cplusplus
 }

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

@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 
-#if DEVICE_SERIAL
-
 #include <ctype.h>
 #include <cstdio>
 #include <string.h>
 #include "greentea-client/test_env.h"
-#include "greentea-client/greentea_serial.h"
 #include "greentea-client/greentea_metrics.h"
 #include "mbed_trace.h"
+#include "platform/mbed_retarget.h"
 
 /**
  *   Generic test suite transport protocol keys
@@ -212,53 +210,53 @@ void greentea_notify_coverage_end() {
  *
  *        This function writes the preamble "{{" which is required
  *        for key-value comunication between the target and the host.
- *        This uses a Rawserial object, greentea_serial, which provides
+ *        This uses a GreenteaSerial object, greentea_serial, which provides
  *        a direct interface to the USBTX and USBRX serial pins and allows
- *        the direct writing of characters using the putc() method.
+ *        the direct writing of characters using the write() method.
  *        This suite of functions are provided to allow for serial communication
  *        to the host from within a thread/ISR.
  *
  */
 inline void greentea_write_preamble()
 {
-    greentea_serial->putc('{');
-    greentea_serial->putc('{');
+    greentea_putc('{');
+    greentea_putc('{');
 }
 
 /**
  * \brief Write the postamble characters to the serial port
  *
  *        This function writes the postamble "{{\n" which is required
  *        for key-value comunication between the target and the host.
- *        This uses a Rawserial object, greentea_serial, which provides
+ *        This uses a GreenteaSerial object, greentea_serial, which provides
  *        a direct interface to the USBTX and USBRX serial pins and allows
- *        the direct writing of characters using the putc() method.
+ *        the direct writing of characters using the write() method.
  *        This suite of functions are provided to allow for serial communication
  *        to the host from within a thread/ISR.
  *
  */
 inline void greentea_write_postamble()
 {
-    greentea_serial->putc('}');
-    greentea_serial->putc('}');
-    greentea_serial->putc('\r');
-    greentea_serial->putc('\n');
+    greentea_putc('}');
+    greentea_putc('}');
+    greentea_putc('\r');
+    greentea_putc('\n');
 }
 
 /**
  * \brief Write a string to the serial port
  *
  *        This function writes a '\0' terminated string from the target
  *        to the host. It writes directly to the serial port using the
- *        greentea_serial, Rawserial object.
+ *        greentea_serial, GreenteaSerial object.
  *
  * \param str - string value
  *
  */
 inline void greentea_write_string(const char *str)
 {
     while (*str != '\0') {
-        greentea_serial->putc(*str);
+        greentea_putc(*str);
         str ++;
     }
 }
@@ -270,7 +268,7 @@ inline void greentea_write_string(const char *str)
  *        This function writes an integer value from the target
  *        to the host. The integer value is converted to a string and
  *        and then written character by character directly to the serial
- *        port using the greentea_serial, Rawserial object.
+ *        port using the greentea_serial, GreenteaSerial object.
  *        sprintf() is used to convert the int to a string. Sprintf if
  *        inherently thread safe so can be used.
  *
@@ -284,7 +282,7 @@ inline void greentea_write_int(const int val)
     unsigned int i = 0;
     sprintf(intval, "%d", val);
     while (intval[i] != '\0') {
-        greentea_serial->putc(intval[i]);
+        greentea_putc(intval[i]);
         i++;
     }
 }
@@ -304,7 +302,7 @@ extern "C" void greentea_send_kv(const char *key, const char *val) {
     if (key && val) {
         greentea_write_preamble();
         greentea_write_string(key);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_string(val);
         greentea_write_postamble();
     }
@@ -327,7 +325,7 @@ void greentea_send_kv(const char *key, const int val) {
     if (key) {
         greentea_write_preamble();
         greentea_write_string(key);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_int(val);
         greentea_write_postamble();
     }
@@ -351,9 +349,9 @@ void greentea_send_kv(const char *key, const char *val, const int result) {
     if (key) {
         greentea_write_preamble();
         greentea_write_string(key);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_string(val);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_int(result);
         greentea_write_postamble();
 
@@ -384,11 +382,11 @@ void greentea_send_kv(const char *key, const char *val, const int passes, const
     if (key) {
         greentea_write_preamble();
         greentea_write_string(key);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_string(val);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_int(passes);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_int(failures);
         greentea_write_postamble();
     }
@@ -417,9 +415,9 @@ void greentea_send_kv(const char *key, const int passes, const int failures) {
     if (key) {
         greentea_write_preamble();
         greentea_write_string(key);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_int(passes);
-        greentea_serial->putc(';');
+        greentea_putc(';');
         greentea_write_int(failures);
         greentea_write_postamble();
     }
@@ -562,7 +560,20 @@ enum Token {
  *
  */
 extern "C" int greentea_getc() {
-    return greentea_serial->getc();
+    uint8_t c;
+    read(STDERR_FILENO, &c, 1);
+    return c;
+}
+
+
+/**
+ * \brief Write character from stream of data
+ *
+ * \return The number of bytes written
+ *
+ */
+extern "C" int greentea_putc(int c) {
+    return write(STDERR_FILENO, &c, 1);
 }
 
 /**
@@ -786,5 +797,3 @@ static int HandleKV(char *out_key,
     getNextToken(0, 0);
     return 0;
 }
-
-#endif

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

@@ -19,10 +19,8 @@
 #include "utest/utest_harness.h"
 #include "utest/utest_stack_trace.h"
 #include "utest/unity_handler.h"
+#include "greentea-client/test_env.h"
 
-#if DEVICE_SERIAL
-#include "greentea-client/greentea_serial.h"
-#endif
 
 void utest_unity_assert_failure(void)
 {
@@ -36,10 +34,7 @@ void utest_unity_ignore_failure(void)
     utest::v1::Harness::raise_failure(utest::v1::failure_reason_t(utest::v1::REASON_ASSERTION | utest::v1::REASON_IGNORE));
 }
 
-#if DEVICE_SERIAL
 void utest_safe_putc(int chr)
 {
-    greentea_serial->putc(chr);
-}    
-#endif
-
+    greentea_putc(chr);
+}