Merge pull request #12208 from hugueskamba/hk-replace-uartserial-st

0xc0170 · web-flow · commit d6e69ef57bab · 2020-01-17T08:19:09.000Z
ST targets: Replace UARTSerial references with BufferedSerial
diff --git a/components/cellular/COMPONENT_STMOD_CELLULAR/STModCellular.cpp b/components/cellular/COMPONENT_STMOD_CELLULAR/STModCellular.cpp
@@ -156,12 +156,12 @@ nsapi_error_t STModCellular::soft_power_off()
 }
 
 #if MBED_CONF_STMOD_CELLULAR_PROVIDE_DEFAULT
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 CellularDevice *CellularDevice::get_default_instance()
 {
     tr_debug("STMOD_CELLULAR default instance");
 
-    static UARTSerial serial(MBED_CONF_STMOD_CELLULAR_TX, MBED_CONF_STMOD_CELLULAR_RX, MBED_CONF_STMOD_CELLULAR_BAUDRATE);
+    static BufferedSerial serial(MBED_CONF_STMOD_CELLULAR_TX, MBED_CONF_STMOD_CELLULAR_RX, MBED_CONF_STMOD_CELLULAR_BAUDRATE);
     if ((MBED_CONF_STMOD_CELLULAR_CTS != NC) && (MBED_CONF_STMOD_CELLULAR_RTS != NC)) {
         serial.set_flow_control(SerialBase::RTSCTS, MBED_CONF_STMOD_CELLULAR_RTS, MBED_CONF_STMOD_CELLULAR_CTS);
     }
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTB_MTS_DRAGONFLY/ONBOARD_TELIT_HE910.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTB_MTS_DRAGONFLY/ONBOARD_TELIT_HE910.cpp
@@ -21,7 +21,7 @@
 #include "platform/mbed_thread.h"
 #include "PinNames.h"
 
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 #include "ONBOARD_TELIT_HE910.h"
 #include "ThisThread.h"
 #include "CellularLog.h"
@@ -80,7 +80,7 @@ void ONBOARD_TELIT_HE910::press_power_button(int time_ms)
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
-    static UARTSerial serial(MDMTXD, MDMRXD, 115200);
+    static BufferedSerial serial(MDMTXD, MDMRXD, 115200);
 #if DEVICE_SERIAL_FC
     if (MDMRTS != NC && MDMCTS != NC) {
         tr_debug("Modem flow control: RTS %d CTS %d", MDMRTS, MDMCTS);
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/ONBOARD_TELIT_HE910.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/ONBOARD_TELIT_HE910.cpp
@@ -20,7 +20,7 @@
 #include "platform/mbed_thread.h"
 #include "PinNames.h"
 
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 #include "ONBOARD_TELIT_HE910.h"
 #include "ThisThread.h"
 #include "CellularLog.h"
@@ -76,7 +76,7 @@ void ONBOARD_TELIT_HE910::press_power_button(int time_ms)
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
-    static UARTSerial serial(MDMTXD, MDMRXD, 115200);
+    static BufferedSerial serial(MDMTXD, MDMRXD, 115200);
 #if DEVICE_SERIAL_FC
     if (MDMRTS != NC && MDMCTS != NC) {
         tr_debug("Modem flow control: RTS %d CTS %d", MDMRTS, MDMCTS);
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/TARGET_MTS_DRAGONFLY_F413RH/ONBOARD_TELIT_HE910.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/TARGET_MTS_DRAGONFLY_F413RH/ONBOARD_TELIT_HE910.cpp
@@ -20,7 +20,7 @@
 #include "platform/mbed_wait_api.h"
 #include "PinNames.h"
 
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 #include "ONBOARD_TELIT_HE910.h"
 #include "ThisThread.h"
 #include "CellularLog.h"
@@ -80,7 +80,7 @@ void ONBOARD_TELIT_HE910::press_power_button(int time_ms)
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
-    static UARTSerial serial(MDMTXD, MDMRXD, 115200);
+    static BufferedSerial serial(MDMTXD, MDMRXD, 115200);
 #if DEVICE_SERIAL_FC
     if (MDMRTS != NC && MDMCTS != NC) {
         tr_debug("Modem flow control: RTS %d CTS %d", MDMRTS, MDMCTS);
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/ONBOARD_UBLOX.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/ONBOARD_UBLOX.cpp
@@ -19,28 +19,28 @@
 #include "ONBOARD_UBLOX_AT.h"
 #include "ONBOARD_UBLOX_PPP.h"
 #include "ONBOARD_UBLOX_N2XX.h"
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 
 using namespace mbed;
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
 #if defined(TARGET_UBLOX_C030_R41XM)
-    static UARTSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
+    static BufferedSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
     static ONBOARD_UBLOX_AT device(&serial);
 #elif defined(TARGET_UBLOX_C030_N211)
-    static UARTSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
+    static BufferedSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
     static ONBOARD_UBLOX_N2XX device(&serial);
 #elif defined(TARGET_UBLOX_C030_U201)
     #if (NSAPI_PPP_AVAILABLE)
-        static UARTSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
+        static BufferedSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
         static ONBOARD_UBLOX_PPP device(&serial);
     #else
-        static UARTSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
+        static BufferedSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
         static ONBOARD_UBLOX_AT device(&serial);
     #endif
 #else //UBLOX_C027
-    static UARTSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
+    static BufferedSerial serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
     static ONBOARD_UBLOX_PPP device(&serial);
 #endif
     return &device;
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/ONBOARD_QUECTEL_UG96.cpp
@@ -21,7 +21,7 @@
 #include "gpio_api.h"
 #include "platform/mbed_thread.h"
 #include "PinNames.h"
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 
 #define WAIT_AFTER_POWR_CHANGED	(1000)	// [msec.]
 
@@ -115,7 +115,7 @@ void ONBOARD_QUECTEL_UG96::onboard_modem_power_down()
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
-    static UARTSerial serial(MDMTXD, MDMRXD, 115200);
+    static BufferedSerial serial(MDMTXD, MDMRXD, 115200);
     static ONBOARD_QUECTEL_UG96 device(&serial);
     return &device;
 }
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/ONBOARD_QUECTEL_BG96.cpp
@@ -21,7 +21,7 @@
 #include "gpio_api.h"
 #include "platform/mbed_thread.h"
 #include "PinNames.h"
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 
 #define WAIT_AFTER_POWR_CHANGED	(1000)	// [msec.]
 
@@ -111,7 +111,7 @@ void ONBOARD_QUECTEL_BG96::onboard_modem_power_down()
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
-    static UARTSerial serial(MDMTXD, MDMRXD, 115200);
+    static BufferedSerial serial(MDMTXD, MDMRXD, 115200);
     static ONBOARD_QUECTEL_BG96 device(&serial);
     return &device;
 }
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_MTS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.cpp b/targets/TARGET_STM/TARGET_STM32L4/TARGET_MTS_DRAGONFLY_L471QG/ONBOARD_SARA4_PPP.cpp
@@ -20,7 +20,7 @@
 #include "gpio_api.h"
 #include "platform/mbed_thread.h"
 #include "PinNames.h"
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 #include "CellularLog.h"
 #include "mbed_wait_api.h"
 
@@ -56,7 +56,7 @@ nsapi_error_t ONBOARD_SARA4_PPP::soft_power_off()
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
-    static UARTSerial serial(MDMTXD, MDMRXD, 115200);
+    static BufferedSerial serial(MDMTXD, MDMRXD, 115200);
 #if DEVICE_SERIAL_FC
     if (MDMRTS != NC && MDMCTS != NC) {
         tr_debug("Modem flow control: RTS %d CTS %d", MDMRTS, MDMCTS);
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_MTB_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.cpp b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_MTB_ADV_WISE_1570/ONBOARD_QUECTEL_BC95.cpp
@@ -18,7 +18,7 @@
 
 #include "ONBOARD_QUECTEL_BC95.h"
 
-#include "UARTSerial.h"
+#include "drivers/BufferedSerial.h"
 #include "CellularLog.h"
 
 using namespace mbed;
@@ -49,7 +49,7 @@ nsapi_error_t ONBOARD_QUECTEL_BC95::soft_power_off()
 
 CellularDevice *CellularDevice::get_target_default_instance()
 {
-    static UARTSerial serial(MDMTXD, MDMRXD, 9600);
+    static BufferedSerial serial(MDMTXD, MDMRXD, 9600);
 #if DEVICE_SERIAL_FC
     if (MDMRTS != NC && MDMCTS != NC) {
         tr_debug("Modem flow control: RTS %d CTS %d", MDMRTS, MDMCTS);

Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,12 @@ nsapi_error_t STModCellular::soft_power_off()`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`#if MBED_CONF_STMOD_CELLULAR_PROVIDE_DEFAULT`
`159`		`-#include "UARTSerial.h"`
	`159`	`+#include "drivers/BufferedSerial.h"`
`160`	`160`	`CellularDevice *CellularDevice::get_default_instance()`
`161`	`161`	`{`
`162`	`162`	`tr_debug("STMOD_CELLULAR default instance");`
`163`	`163`
`164`		`- static UARTSerial serial(MBED_CONF_STMOD_CELLULAR_TX, MBED_CONF_STMOD_CELLULAR_RX, MBED_CONF_STMOD_CELLULAR_BAUDRATE);`
	`164`	`+ static BufferedSerial serial(MBED_CONF_STMOD_CELLULAR_TX, MBED_CONF_STMOD_CELLULAR_RX, MBED_CONF_STMOD_CELLULAR_BAUDRATE);`
`165`	`165`	`if ((MBED_CONF_STMOD_CELLULAR_CTS != NC) && (MBED_CONF_STMOD_CELLULAR_RTS != NC)) {`
`166`	`166`	`serial.set_flow_control(SerialBase::RTSCTS, MBED_CONF_STMOD_CELLULAR_RTS, MBED_CONF_STMOD_CELLULAR_CTS);`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#include "gpio_api.h"`
`22`	`22`	`#include "platform/mbed_thread.h"`
`23`	`23`	`#include "PinNames.h"`
`24`		`-#include "UARTSerial.h"`
	`24`	`+#include "drivers/BufferedSerial.h"`
`25`	`25`
`26`	`26`	`#define WAIT_AFTER_POWR_CHANGED (1000) // [msec.]`
`27`	`27`
`@@ -115,7 +115,7 @@ void ONBOARD_QUECTEL_UG96::onboard_modem_power_down()`
`115`	`115`
`116`	`116`	`CellularDevice *CellularDevice::get_target_default_instance()`
`117`	`117`	`{`
`118`		`- static UARTSerial serial(MDMTXD, MDMRXD, 115200);`
	`118`	`+ static BufferedSerial serial(MDMTXD, MDMRXD, 115200);`
`119`	`119`	`static ONBOARD_QUECTEL_UG96 device(&serial);`
`120`	`120`	`return &device;`
`121`	`121`	`}`