Merge branch 'master' into ubx_context_activation

Author: mudassar-ublox

.gitattributes

@@ -2,6 +2,7 @@
 *.cpp     text
 *.h       text
 *.s       text
+*.S       text
 *.sct     text
 *.ld      text
 *.txt     text

TESTS/mbed-crypto/sanity/main.cpp

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#include "psa/crypto.h"
+
 #if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
 #error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
 #endif
@@ -24,7 +26,6 @@
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
-#include "psa/crypto.h"
 #include "entropy.h"
 #include "entropy_poll.h"
 

TESTS/mbed_drivers/timeout/timeout_tests.h

@@ -313,9 +313,9 @@ void test_deepsleep(void)
 
      * This should be replaced with a better function that checks if the
      * hardware buffers are empty. However, such an API does not exist now,
-     * so we'll use the wait_ms() function for now.
+     * so we'll use the ThisThread::sleep_for() function for now.
      */
-    wait_ms(20);
+    ThisThread::sleep_for(20);
 
     timer.start();
     timeout.attach_callback(mbed::callback(sem_callback, &sem), delay_us);

TESTS/mbed_drivers/watchdog/main.cpp

@@ -68,7 +68,7 @@ using utest::v1::Harness;
 
 using namespace mbed;
 
-Thread wdg_kicking_thread;
+Thread wdg_kicking_thread(osPriorityNormal, 768);
 Semaphore kick_wdg_during_test_teardown(0, 1);
 
 void wdg_kicking_thread_fun()

TESTS/mbed_hal/pinmap/main.cpp

@@ -20,6 +20,7 @@
 
 using namespace utest::v1;
 
+#include "gpio_api.h"
 #include "analogin_api.h"
 #include "analogout_api.h"
 #include "can_api.h"
@@ -38,6 +39,7 @@ typedef struct {
 } pinmap_info_t;
 
 const pinmap_info_t pinmap_functions[] = {
+    PINMAP_TEST_ENTRY(gpio_pinmap),
 #if DEVICE_ANALOGIN
     PINMAP_TEST_ENTRY(analogin_pinmap),
 #endif

TESTS/mbed_hal/rtc/main.cpp

@@ -125,7 +125,7 @@ void rtc_persist_test()
     rtc_write(start);
     rtc_free();
 
-    wait(WAIT_TIME);
+    ThisThread::sleep_for(WAIT_TIME * 1000);
 
     rtc_init();
     const uint32_t stop = rtc_read();
@@ -167,7 +167,7 @@ void rtc_range_test()
     for (uint32_t i = 0; i < sizeof(starts) / sizeof(starts[0]); i++) {
         const uint32_t start = starts[i];
         rtc_write(start);
-        wait(WAIT_TIME);
+        ThisThread::sleep_for(WAIT_TIME * 1000);
         const uint32_t stop = rtc_read();
         TEST_ASSERT_UINT32_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
     }

TESTS/mbed_hal/watchdog/main.cpp

@@ -69,7 +69,7 @@ using utest::v1::Harness;
 
 const watchdog_config_t WDG_CONFIG_DEFAULT = { .timeout_ms = WDG_TIMEOUT_MS };
 
-Thread wdg_kicking_thread;
+Thread wdg_kicking_thread(osPriorityNormal, 768);
 Semaphore kick_wdg_during_test_teardown(0, 1);
 
 void wdg_kicking_thread_fun()

TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp

@@ -36,8 +36,8 @@ using namespace utest::v1;
 
 #define analogin_debug_printf(...)
 
-#define DELTA_FLOAT                     0.03f    // 3%
-#define DELTA_U16                       1965     // 3%
+#define DELTA_FLOAT                     0.05f    // 5%
+#define DELTA_U16                       3277     // 5%
 
 const PinList *form_factor = pinmap_ff_default_pins();
 const PinList *restricted = pinmap_restricted_pins();

TESTS/mbed_hal_fpga_ci_test_shield/analogout/main.cpp

@@ -366,6 +366,7 @@ void i2c_test_byte_read(PinName sda, PinName scl)
     // Reset tester stats and select I2C
     tester.peripherals_reset();
     tester.select_peripheral(MbedTester::PeripheralI2C);
+    tester.set_next_from_slave(0);
     for (int i = 0; i < TRANSFER_COUNT; i++) {
         data_in[i] = 0;
     }
@@ -413,7 +414,7 @@ void i2c_test_byte_read(PinName sda, PinName scl)
     TEST_ASSERT_EQUAL(num_nacks, tester.num_nacks());
     TEST_ASSERT_EQUAL(checksum, tester.get_send_checksum());
     TEST_ASSERT_EQUAL(0, tester.state_num());
-    TEST_ASSERT_EQUAL(((TRANSFER_COUNT + 2) & 0xFF), tester.get_next_from_slave());
+    TEST_ASSERT_EQUAL(((TRANSFER_COUNT) & 0xFF), tester.get_next_from_slave());
     TEST_ASSERT_EQUAL(num_writes, tester.num_writes());
     TEST_ASSERT_EQUAL(num_reads, tester.num_reads());
 

TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp

@@ -122,6 +122,8 @@ void pwm_period_fill_test(PinName pin, uint32_t period_ms, uint32_t fill_prc, pw
             break;
     }
 
+    wait(PERIOD_FLOAT(period_ms));
+
     tester.io_metrics_start();
 
     wait(NUM_OF_PERIODS * PERIOD_FLOAT(period_ms));

TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp

@@ -55,7 +55,7 @@ void spi_async_handler()
 {
     int event = spi_irq_handler_asynch(&spi);
 
-    if (event == SPI_EVENT_COMPLETE) {
+    if (event & SPI_EVENT_COMPLETE) {
         async_trasfer_done = true;
     }
 }
@@ -136,7 +136,7 @@ void spi_test_common(PinName mosi, PinName miso, PinName sclk, PinName ssel, SPI
 
             async_trasfer_done = false;
 
-            spi_master_transfer(&spi, tx_buf, TRANSFER_COUNT, rx_buf, TRANSFER_COUNT, 8, (uint32_t)spi_async_handler, 0, DMA_USAGE_NEVER);
+            spi_master_transfer(&spi, tx_buf, TRANSFER_COUNT, rx_buf, TRANSFER_COUNT, 8, (uint32_t)spi_async_handler, SPI_EVENT_COMPLETE, DMA_USAGE_NEVER);
             while (!async_trasfer_done);
 
             for (int i = 0; i < TRANSFER_COUNT; i++) {

TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp

@@ -118,11 +118,13 @@ static void uart_test_common(int baudrate, int data_bits, SerialParity parity, i
     serial_init(&serial, tx, rx);
     serial_baud(&serial, baudrate);
     serial_format(&serial, data_bits, parity, stop_bits);
+#if DEVICE_SERIAL_FC
     if (use_flow_control) {
         serial_set_flow_control(&serial, FlowControlRTSCTS, rts, cts);
     } else {
         serial_set_flow_control(&serial, FlowControlNone, NC, NC);
     }
+#endif
 
     // Reset tester stats and select UART
     tester.peripherals_reset();
@@ -277,9 +279,11 @@ void test_init_free(PinName tx, PinName rx, PinName cts = NC, PinName rts = NC)
     serial_init(&serial, tx, rx);
     serial_baud(&serial, 9600);
     serial_format(&serial, 8, ParityNone, 1);
+#if DEVICE_SERIAL_FC
     if (use_flow_control) {
         serial_set_flow_control(&serial, FlowControlRTSCTS, rts, cts);
     }
+#endif
     serial_free(&serial);
 }
 
@@ -302,28 +306,38 @@ void test_common_no_fc(PinName tx, PinName rx)
 
 Case cases[] = {
     // Every set of pins from every peripheral.
-    Case("init/free, FC on", all_ports<UARTPort, DefaultFormFactor, test_init_free>),
     Case("init/free, FC off", all_ports<UARTNoFCPort, DefaultFormFactor, test_init_free_no_fc>),
 
     // One set of pins from every peripheral.
-    Case("basic, 9600, 8N1, FC on", all_peripherals<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityNone, 1> >),
     Case("basic, 9600, 8N1, FC off", all_peripherals<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<9600, 8, ParityNone, 1> >),
 
     // One set of pins from one peripheral.
     // baudrate
-    Case("19200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<19200, 8, ParityNone, 1> >),
     Case("19200, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<19200, 8, ParityNone, 1> >),
-    Case("38400, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<38400, 8, ParityNone, 1> >),
     Case("38400, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<38400, 8, ParityNone, 1> >),
-    Case("115200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<115200, 8, ParityNone, 1> >),
     Case("115200, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<115200, 8, ParityNone, 1> >),
+    // stop bits
+    Case("9600, 8N2, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<9600, 8, ParityNone, 2> >),
+
+#if DEVICE_SERIAL_FC
+    // Every set of pins from every peripheral.
+    Case("init/free, FC on", all_ports<UARTPort, DefaultFormFactor, test_init_free>),
+
+    // One set of pins from every peripheral.
+    Case("basic, 9600, 8N1, FC on", all_peripherals<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityNone, 1> >),
+
+    // One set of pins from one peripheral.
+    // baudrate
+    Case("19200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<19200, 8, ParityNone, 1> >),
+    Case("38400, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<38400, 8, ParityNone, 1> >),
+    Case("115200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<115200, 8, ParityNone, 1> >),
     // data bits: not tested (some platforms support 8 bits only)
     // parity
     Case("9600, 8O1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityOdd, 1> >),
     Case("9600, 8E1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityEven, 1> >),
     // stop bits
     Case("9600, 8N2, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityNone, 2> >),
-    Case("9600, 8N2, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<9600, 8, ParityNone, 2> >),
+#endif
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)