Fixes in System.IO.Port (#2434)

***NO_CI***

Author: josesimoes

targets/AzureRTOS/ST/_nanoCLR/System.IO.Ports/sys_io_ser_native_System_IO_Ports_SerialPort.cpp

@@ -240,18 +240,20 @@ static void RxChar(UARTDriver *uartp, uint16_t c)
     }
     else
     {
-        // no read operation ongoing, so fire an event
-
-        // post a managed event with the port index and event code (check if this is the watch char or just another
-        // another)
-        // TODO: check if callbacks are registered so this is called only if there is anyone listening otherwise don't
-        // bother for that to happen ChibiOS callback has to accept arg which we would passing the GpioPin
-        // CLR_RT_HeapBlock (see Gpio handler) check http://www.chibios.com/forum/viewtopic.php?f=36&t=4798
-        PostManagedEvent(
-            EVENT_SERIAL,
-            0,
-            portIndex,
-            (c == palUart->WatchChar) ? SerialData_WatchChar : SerialData_Chars);
+        // no read operation ongoing, so fire an event, if the available bytes are above the threshold
+        if (palUart->RxRingBuffer.Length() >= palUart->ReceivedBytesThreshold)
+        {
+            // post a managed event with the port index and event code (check if this is the watch char or just another
+            // another)
+            // TODO: check if callbacks are registered so this is called only if there is anyone listening otherwise
+            // don't bother for that to happen ChibiOS callback has to accept arg which we would passing the GpioPin
+            // CLR_RT_HeapBlock (see Gpio handler) check http://www.chibios.com/forum/viewtopic.php?f=36&t=4798
+            PostManagedEvent(
+                EVENT_SERIAL,
+                0,
+                portIndex,
+                (c == palUart->WatchChar) ? SerialData_WatchChar : SerialData_Chars);
+        }
     }
 
     NATIVE_INTERRUPT_END
@@ -414,7 +416,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::Read___I4__SZARRAY
         }
     }
 
-    // get a the pointer to the array by using the first element of the array
+    // get a the pointer to the array by using the offset
     data = dataBuffer->GetElement(offset);
 
     // Choose the driver for this SerialDevice
@@ -601,18 +603,20 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::ReadLine___STRING(
             // got one!
             eventResult = false;
         }
+        else
+        {
+            // get new line from field
+            newLine = pThis[FIELD___newLine].RecoverString();
+            newLineLength = hal_strlen_s(newLine);
+            // need to subtract one because we are 0 indexed
+            newLineLength--;
 
-        // get new line from field
-        newLine = pThis[FIELD___newLine].RecoverString();
-        newLineLength = hal_strlen_s(newLine);
-        // need to subtract one because we are 0 indexed
-        newLineLength--;
-
-        // set new line char as the last one in the string
-        // only if this one is found it will have a chance of the others being there
-        palUart->NewLineChar = newLine[newLineLength];
+            // set new line char as the last one in the string
+            // only if this one is found it will have a chance of the others being there
+            palUart->NewLineChar = newLine[newLineLength];
 
-        stack.m_customState = 2;
+            stack.m_customState = 2;
+        }
     }
 
     while (eventResult)
@@ -713,27 +717,27 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::Write___VOID__SZAR
             NANOCLR_SET_AND_LEAVE(CLR_E_INVALID_PARAMETER);
         }
 
-        // get a the pointer to the array by using the first element of the array
+        // get a the pointer to the array by using the offset
         data = dataBuffer->GetElement(offset);
 
         // push onto the eval stack how many bytes are being pushed to the UART
-        stack.PushValueI4(length - offset);
+        stack.PushValueI4(count);
 
         // flush DMA buffer to ensure cache coherency
         // (only required for Cortex-M7)
-        cacheBufferFlush(data, length - offset);
+        cacheBufferFlush(data, count);
 
         // store pointer
         palUart->TxBuffer = data;
 
         // set TX ongoing count
-        palUart->TxOngoingCount = length - offset;
+        palUart->TxOngoingCount = count;
 
         // because the UART can be accessed from several threads need to get exclusive access to it
         uartAcquireBus(palUart->UartDriver);
 
         // start sending data (DMA will read from the ring buffer)
-        uartStartSend(palUart->UartDriver, length - offset, (uint8_t *)data);
+        uartStartSend(palUart->UartDriver, count, (uint8_t *)data);
 
         // bump custom state
         stack.m_customState = 2;
@@ -752,7 +756,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::Write___VOID__SZAR
         {
             // event occurred
             // get from the eval stack how many bytes were buffered to Tx
-            length = stack.m_evalStack[1].NumericByRef().s4;
+            count = stack.m_evalStack[1].NumericByRef().s4;
 
             // done here
             break;
@@ -763,13 +767,13 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::Write___VOID__SZAR
         }
     }
 
-    // pop "length" heap block from stack
+    // pop "count" heap block from stack
     stack.PopValue();
 
     // pop "hbTimeout" heap block from stack
     stack.PopValue();
 
-    stack.SetResult_U4(length);
+    stack.SetResult_U4(count);
 
     // null pointers and vars
     pThis = NULL;
@@ -852,6 +856,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID(
 
     NF_PAL_UART *palUart;
     int32_t bufferSize;
+    uint8_t watchChar;
 
     // get a pointer to the managed object instance and check that it's not NULL
     CLR_RT_HeapBlock *pThis = stack.This();
@@ -940,6 +945,15 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeInit___VOID(
     palUart->Uart_cfg.rxchar_cb = RxChar;
     // palUart->Uart_cfg.rxend_cb = RxEnd;
 
+    // get watch character
+    watchChar = pThis[FIELD___watchChar].NumericByRef().u1;
+
+    // set watch char, if set
+    if (watchChar != 0)
+    {
+        palUart->WatchChar = watchChar;
+    }
+
     // call the configure
     return NativeConfig___VOID(stack);
 
@@ -1105,7 +1119,7 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::NativeWriteString_
 
     bool isNewAllocation = false;
     char *buffer = NULL;
-    uint32_t bufferLength = 0;
+    uint32_t bufferLength;
     int32_t length = 0;
 
     // get a pointer to the managed object instance and check that it's not NULL
@@ -1261,32 +1275,33 @@ HRESULT Library_sys_io_ser_native_System_IO_Ports_SerialPort::GetDeviceSelector_
 
     // declare the device selector string whose max size is "COM1,COM2,COM3,COM4,COM5,COM6,COM7,COM8," + terminator
     // and init with the terminator
-    char deviceSelectorString[40 + 1] = {0};
+    static char deviceSelectorString[] =
 
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_USART1) && (NF_SERIAL_COMM_STM32_UART_USE_USART1 == TRUE)
-    strcat(deviceSelectorString, "COM1,");
+        "COM1,"
 #endif
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_USART2) && (NF_SERIAL_COMM_STM32_UART_USE_USART2 == TRUE)
-    strcat(deviceSelectorString, "COM2,");
+        "COM2,"
 #endif
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_USART3) && (NF_SERIAL_COMM_STM32_UART_USE_USART3 == TRUE)
-    strcat(deviceSelectorString, "COM3,");
+        "COM3,"
 #endif
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_UART4) && (NF_SERIAL_COMM_STM32_UART_USE_UART4 == TRUE)
-    strcat(deviceSelectorString, "COM4,");
+        "COM4,"
 #endif
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_UART5) && (NF_SERIAL_COMM_STM32_UART_USE_UART5 == TRUE)
-    strcat(deviceSelectorString, "COM5,");
+        "COM5,"
 #endif
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_USART6) && (NF_SERIAL_COMM_STM32_UART_USE_USART6 == TRUE)
-    strcat(deviceSelectorString, "COM6,");
+        "COM6,"
 #endif
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_UART7) && (NF_SERIAL_COMM_STM32_UART_USE_UART7 == TRUE)
-    strcat(deviceSelectorString, "COM7,");
+        "COM7,"
 #endif
 #if defined(NF_SERIAL_COMM_STM32_UART_USE_UART8) && (NF_SERIAL_COMM_STM32_UART_USE_UART8 == TRUE)
-    strcat(deviceSelectorString, "COM8,");
+        "COM8,"
 #endif
+        ;
 
     // replace the last comma with a terminator
     if (deviceSelectorString[hal_strlen_s(deviceSelectorString) - 1] == ',')

targets/AzureRTOS/ST/_nanoCLR/System.IO.Ports/sys_io_ser_native_target.h

@@ -9,7 +9,6 @@
 #include <target_system_io_ports_config.h>
 #include <sys_io_ser_native.h>
 #include <hal.h>
-#include <nanoHAL.h>
 
 // struct representing the UART
 typedef struct
@@ -61,7 +60,7 @@ extern NF_PAL_UART Uart8_PAL;
 #endif
 
 // the following macro defines a function that configures the GPIO pins for a STM32 UART/USART
-// it gets called in the Windows_Devices_SerialCommunication_SerialDevice::NativeConfig function
+// it gets called in the System_IO_Ports_SerialPort::NativeConfig function
 // this is required because the UART/USART peripherals can use multiple GPIO configuration combinations
 #define UART_CONFIG_PINS(num, gpio_port_tx, gpio_port_rx, tx_pin, rx_pin, alternate_function)                          \
     void ConfigPins_UART##num()                                                                                        \
@@ -72,7 +71,7 @@ extern NF_PAL_UART Uart8_PAL;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // when a UART/USART is defined the declarations below will have the real function/configuration
-// in the target folder @ target_windows_devices_serialcommunication_config.cpp
+// in the target folder @ target_system_io_ports_config.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 void ConfigPins_UART1();
 void ConfigPins_UART2();
@@ -84,7 +83,7 @@ void ConfigPins_UART7();
 void ConfigPins_UART8();
 
 // the following macro defines a function that initializes an UART struct
-// it gets called in the Windows_Devices_SerialCommunication_SerialDevice::NativeInit function
+// it gets called in the system_io_ports_SerialDevice::NativeInit function
 
 #if defined(STM32F7XX) || defined(STM32F0XX)
 
@@ -111,7 +110,7 @@ void ConfigPins_UART8();
 
 #else
 
-// all other STM32F use UART driver v1 which has a different UARTConfig struct
+// all other STM32F series use UART driver v1 which has a different UARTConfig struct
 #define UART_INIT(num)                                                                                                 \
     void Init_UART##num()                                                                                              \
     {                                                                                                                  \
@@ -133,7 +132,7 @@ void ConfigPins_UART8();
 #endif
 
 // when a UART/USART is defined the declarations below will have the real function/configuration
-// in the target folder @ target_windows_devices_serialcommunication_config.cpp
+// in the target folder @ target_system_io_ports_config.cpp
 void Init_UART1();
 void Init_UART2();
 void Init_UART3();
@@ -144,7 +143,7 @@ void Init_UART7();
 void Init_UART8();
 
 // the following macro defines a function that un initializes an UART struct
-// it gets called in the Windows_Devices_SerialCommunication_SerialDevice::NativeDispose function
+// it gets called in the System_IO_Ports_SerialPort::NativeDispose function
 #define UART_UNINIT(num)                                                                                               \
     void UnInit_UART##num()                                                                                            \
     {                                                                                                                  \
@@ -157,7 +156,7 @@ void Init_UART8();
     }
 
 // when a UART/USART is defined the declarations below will have the real function/configuration
-// in the target folder @ target_windows_devices_serialcommunication_config.cpp
+// in the target folder @ target_system_io_ports_config.cpp
 void UnInit_UART1();
 void UnInit_UART2();
 void UnInit_UART3();