Release candidate for mbed-os-5.2.2

.travis.yml

@@ -7,6 +7,7 @@ script:
   - python tools/test/pylint.py
   - py.test tools/test/toolchains/api.py
   - python tools/test/memap/memap_test.py
+  - python tools/project.py -S
   - python tools/build_travis.py
 before_install:
   - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
@@ -16,9 +17,7 @@ before_install:
   - arm-none-eabi-gcc --version
   - python --version
 install:
-  - sudo pip install colorama
-  - sudo pip install prettytable
-  - sudo pip install jinja2
+  - sudo pip install -r requirements.txt
   - sudo pip install pytest
   - sudo pip install pylint
   - sudo pip install hypothesis

TESTS/mbed_drivers/lp_timeout/main.cpp

@@ -118,7 +118,7 @@ void lp_timeout_500us(void)
 
 }
 
-status_t greentea_failure_handler(const Case *const source, const failure_t reason) {
+utest::v1::status_t greentea_failure_handler(const Case *const source, const failure_t reason) {
     greentea_case_failure_abort_handler(source, reason);
     return STATUS_CONTINUE;
 }
@@ -134,7 +134,7 @@ Case cases[] = {
 #endif /* DEVICE_SLEEP */
 };
 
-status_t greentea_test_setup(const size_t number_of_cases) {
+utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
     GREENTEA_SETUP(20, "default_auto");
     return greentea_test_setup_handler(number_of_cases);
 }

TESTS/mbed_hal/lp_ticker/main.cpp

@@ -133,7 +133,7 @@ void lp_ticker_5s(void)
     lp_ticker_delay_us(5000000, LONG_TIMEOUT);
 }
 
-status_t greentea_failure_handler(const Case *const source, const failure_t reason) {
+utest::v1::status_t greentea_failure_handler(const Case *const source, const failure_t reason) {
     greentea_case_failure_abort_handler(source, reason);
     return STATUS_CONTINUE;
 }
@@ -149,7 +149,7 @@ Case cases[] = {
 #endif /* DEVICE_SLEEP */
 };
 
-status_t greentea_test_setup(const size_t number_of_cases) {
+utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
     GREENTEA_SETUP(20, "default_auto");
     lp_ticker_data->interface->init();
     return greentea_test_setup_handler(number_of_cases);

TESTS/mbedmicro-mbed/cpp/main.cpp

@@ -9,8 +9,10 @@ class Test {
     const int pattern;
 
 public:
-    Test(const char* _name) : name(_name), pattern(PATTERN_CHECK_VALUE)  {
-        print("init");
+    Test(const char* _name, bool print_message=true) : name(_name), pattern(PATTERN_CHECK_VALUE)  {
+        if (print_message) {
+            print("init");
+        }
     }
 
     void print(const char *message) {
@@ -39,7 +41,7 @@ class Test {
 };
 
 /* Check C++ startup initialisation */
-Test s("Static");
+Test s("Static", false);
 
 /* EXPECTED OUTPUT:
 *******************
@@ -59,6 +61,7 @@ int main (void) {
     bool result = true;
     for (;;)
     {
+        s.print("init");
         // Global stack object simple test
         s.stack_test();
         if (s.check_init() == false)

TESTS/mbedmicro-rtos-mbed/threads/main.cpp

@@ -25,6 +25,8 @@
     #define STACK_SIZE 512
 #elif defined(TARGET_XDOT_L151CC)
     #define STACK_SIZE 1024
+#elif defined(TARGET_HI2110)
+    #define STACK_SIZE 512
 #else
     #define STACK_SIZE DEFAULT_STACK_SIZE
 #endif

docs/exporters.md

@@ -0,0 +1,60 @@
+# About the exporters
+
+The mbed exporters are used to export your code to various 3rd party tools and IDEs. Each exporter implements a `generate` function that produces an IDE specific project file. Exporters benefit from [mbed build tools](https://github.com/ARMmbed/mbed-os/blob/master/docs/BUILDING.md#build-mbed-sdk-library-from-sources). However, instead of using your source and [config data](https://github.com/ARMmbed/mbed-os/blob/master/docs/config_system.md) to create an executable, we use that information to populate an IDE project file that will be configured to build, flash, and debug your code. You can find exporter implementations [here](https://github.com/ARMmbed/mbed-os/tree/master/tools/export).
+
+## mbed-cli command
+
+`mbed export -m [target] -i [IDE]`
+
+# Adding export support for a target
+
+If you have added new target to the mbed SDK, exporting will allow users to transition from mbed source code to the offline development environment of their choice. This functionality activates the use of your device for larger number of users.
+
+## Eclipse and Make 
+
+Eclipse project export utilizes a generated Makefile for building. Other than target configuration within the [config system](https://github.com/ARMmbed/mbed-os/blob/master/docs/mbed_targets.md) for mbed build system support, there is no additional work to provide Make export.
+
+### Available mbed-cli commands
+
+`mbed export -m [target] -i [make_gcc_arm, make_iar, make_armc5, eclipse_gcc_arm, eclipse_iar, eclipse_armc5]`
+
+## UVision and IAR
+
+### CMSIS Packs
+
+UVision and IAR both utilize [CMSIS packs](http://www.keil.com/pack/doc/CMSIS/Pack/html/index.html) to find target information necessary to create a valid project file. 
+
+We utilize the tool [ArmPackManager](https://github.com/ARMmbed/mbed-os/tree/master/tools/arm_pack_manager) to scrape [MDK5 Software Packs](https://www.keil.com/dd2/Pack/) for target information. This is achieved by parsing [http://www.keil.com/pack/index.idx](http://sadevicepacksprod.blob.core.windows.net/idxfile/index.idx). The relevant information in the [PDSC (Pack Description)](http://www.keil.com/pack/doc/CMSIS/Pack/html/_pack_format.html) retrieved from each URL in the index is stored in [index.json](https://github.com/ARMmbed/mbed-os/blob/master/tools/arm_pack_manager/index.json). A `.pdsc` file typically describes a family of devices. Each device is uniquely identified by its [device name](https://github.com/ARMmbed/mbed-os/blob/master/docs/mbed_targets.md#device_name). Thus, this name makes a natural key to associate a device with its information in `index.json`. 
+
+#### What's in a device name?
+There is no reliable way to map an mbed alias like [NUCLEO_F030R8](https://github.com/ARMmbed/mbed-os/blob/master/targets/targets.json#L603) to its unique identifier, [STM32F030R8](https://github.com/ARMmbed/mbed-os/blob/master/targets/targets.json#L615), as it is listed in a CMSIS pack (and subsequently `index.json`). So, we added a [device name](https://github.com/ARMmbed/mbed-os/blob/master/docs/mbed_targets.md#device_name) field in `targets.json`. **This field is required for IAR or UVision exporter support**.
+
+#### Code Usage
+http://www.keil.com/pack/Keil.Kinetis_K20_DFP.pdsc is the PDSC that contains TEENSY_31 device (MK20DX256xxx7). It has been parsed by ArmPackManager and stored in `index.json`. The device information begins on line 156:
+```xml
+      <device Dname="MK20DX256xxx7">
+        <processor Dfpu="0" Dmpu="0" Dendian="Little-endian" Dclock="72000000"/>
+        <compile header="Device\Include\MK20D7.h"  define="MK20DX256xxx7"/>
+        <debug      svd="SVD\MK20D7.svd"/>
+        <memory     id="IROM1"                      start="0x00000000"  size="0x40000"    startup="1"   default="1"/>
+        <memory     id="IROM2"                      start="0x10000000"  size="0x8000"     startup="0"   default="0"/>
+        <memory     id="IRAM1"                      start="0x20000000"  size="0x8000"     init   ="0"   default="1"/>
+        <memory     id="IRAM2"                      start="0x1FFF8000"  size="0x8000"     init   ="0"   default="0"/>
+        <algorithm  name="Flash\MK_P256.FLM"        start="0x00000000"  size="0x40000"                  default="1"/>
+        <algorithm  name="Flash\MK_D32_72MHZ.FLM"   start="0x10000000"  size="0x8000"                   default="1"/>
+        <book name="Documents\K20P100M72SF1RM.pdf"         title="MK20DX256xxx7 Reference Manual"/>
+        <book name="Documents\K20P100M72SF1.pdf"           title="MK20DX256xxx7 Data Sheet"/>
+      </device>
+```
+
+##### Uvision
+The dname (device name) field on line 156 directly corresponds to that in the Uvision5 IDE target selection window. [`tools/export/uvision/uvision.tmpl`](https://github.com/ARMmbed/mbed-os/blob/master/tools/export/uvision/uvision.tmpl#L15), uses target information from these packs is used to generate valid Uvision5 projects. If the device name is not found, we use a generic ARM CPU target in Uvision5.
+
+##### IAR
+[`tools/export/iar/iar_definitions.json`](https://github.com/ARMmbed/mbed-os/blob/master/tools/export/iar/iar_definitions.json) utilizes this device name to store information necessary to set the target in an IAR project.
+
+
+
+
+
+

docs/mbed_targets.md

@@ -164,6 +164,5 @@ The hook code can look quite different between different targets. Take a look at
 
 This property is used to pass necessary data for exporting the mbed code to various 3rd party tools and IDEs.
 
-This is possible because the device name corresponds to a field in publicly hosted CMSIS packs. These packs hold target properties. [This](http://www.keil.com/pack/Keil.Kinetis_K20_DFP.pdsc) is the pdsc that contains TEENSY_31 device (MK20DX256xxx7). The device information begins on line 156. The dname (device name) field on line 156 directly corresponds to that in the Uvision5 IDE target selection window. Beginning on line 15 of `tools/export/uvision/uvision.tmpl`, target information from these packs is used to generate valid Uvision5 projects. If the device name is not found, we use a generic ARM CPU target in Uvision5.
-`tools/export/iar/iar_definitions.json` utilizes this device name to store information necessary to set the target in an IAR project.
+Please see [exporters.md](exporters.md) for information about this field.
 

docs/testing_mbed_OS_5.md

@@ -78,7 +78,9 @@ The full build process is:
 
 When building an mbed application, the presence of a `mbed_app.json` file allows you to set or override different config settings from libraries and targets. However, because the tests share a common build, this can cause issues when tests have different configurations that affect the OS.
 
-If you need to use app config, this must be set via the `--app-config` option when calling `mbed test`. **If this option is not specified, the build system will ignore all `mbed_app.json` files and use the default config values.**
+The build system will look for an `mbed_app.json` file in your shared project files (any directory not inside of a `TESTS` folder). If this is found, this configuration file will be used for both the non-test code as well as each test case inside your project's source tree. If there is more than one `mbed_app.json` files in the source tree, the config system will error.
+
+If you need to test with multiple configurations, then you can use the `--app-config` option. This will override the search for an `mbed_app.json` file and use the config file you specify for the build.
 
 ### Running tests
 

features/FEATURE_LWIP/lwip-interface/EthernetInterface.cpp

@@ -24,30 +24,30 @@ EthernetInterface::EthernetInterface()
 {
 }
 
-int EthernetInterface::set_network(const char *ip_address, const char *netmask, const char *gateway)
+nsapi_error_t EthernetInterface::set_network(const char *ip_address, const char *netmask, const char *gateway)
 {
     _dhcp = false;
     strncpy(_ip_address, ip_address ? ip_address : "", sizeof(_ip_address));
     strncpy(_netmask, netmask ? netmask : "", sizeof(_netmask));
     strncpy(_gateway, gateway ? gateway : "", sizeof(_gateway));
-    return 0;
+    return NSAPI_ERROR_OK;
 }
 
-int EthernetInterface::set_dhcp(bool dhcp)
+nsapi_error_t EthernetInterface::set_dhcp(bool dhcp)
 {
     _dhcp = dhcp;
-    return 0;
+    return NSAPI_ERROR_OK;
 }
 
-int EthernetInterface::connect()
+nsapi_error_t EthernetInterface::connect()
 {
     return mbed_lwip_bringup(_dhcp,
             _ip_address[0] ? _ip_address : 0,
             _netmask[0] ? _netmask : 0,
             _gateway[0] ? _gateway : 0);
 }
 
-int EthernetInterface::disconnect()
+nsapi_error_t EthernetInterface::disconnect()
 {
     return mbed_lwip_bringdown();
 }
@@ -63,7 +63,7 @@ const char *EthernetInterface::get_ip_address()
         return _ip_address;
     }
 
-    return 0;
+    return NULL;
 }
 
 const char *EthernetInterface::get_netmask()

features/FEATURE_LWIP/lwip-interface/EthernetInterface.h

@@ -46,7 +46,8 @@ class EthernetInterface : public EthInterface
      *  @param gateway  Null-terminated representation of the local gateway
      *  @return         0 on success, negative error code on failure
      */
-    virtual int set_network(const char *ip_address, const char *netmask, const char *gateway);
+    virtual nsapi_error_t set_network(
+            const char *ip_address, const char *netmask, const char *gateway);
 
     /** Enable or disable DHCP on the network
      *
@@ -55,17 +56,17 @@ class EthernetInterface : public EthInterface
      *  @param dhcp     False to disable dhcp (defaults to enabled)
      *  @return         0 on success, negative error code on failure
      */
-    virtual int set_dhcp(bool dhcp);
+    virtual nsapi_error_t set_dhcp(bool dhcp);
 
     /** Start the interface
      *  @return             0 on success, negative on failure
      */
-    virtual int connect();
+    virtual nsapi_error_t connect();
 
     /** Stop the interface
      *  @return             0 on success, negative on failure
      */
-    virtual int disconnect();
+    virtual nsapi_error_t disconnect();
 
     /** Get the local MAC address
      *

features/FEATURE_LWIP/lwip-interface/emac_stack_lwip.cpp

@@ -47,6 +47,11 @@ void emac_stack_mem_free(emac_stack_t* stack, emac_stack_mem_t *mem)
     pbuf_free((struct pbuf*)mem);
 }
 
+void emac_stack_mem_copy(emac_stack_t* stack, emac_stack_mem_t *to, emac_stack_mem_t *from)
+{
+    pbuf_copy((struct pbuf*)to, (struct pbuf*)from);
+}
+
 void *emac_stack_mem_ptr(emac_stack_t* stack, emac_stack_mem_t *mem)
 {
     return ((struct pbuf*)mem)->payload;

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c

@@ -102,24 +102,22 @@ static void update_read_buffer(uint8_t *buf)
  */
 static void k64f_tx_reclaim(struct k64f_enetdata *k64f_enet)
 {
-  uint8_t i = 0 ;
-
   /* Get exclusive access */
   sys_mutex_lock(&k64f_enet->TXLockMutex);
 
-  i = k64f_enet->tx_consume_index;
   // Traverse all descriptors, looking for the ones modified by the uDMA
-  while((i != k64f_enet->tx_produce_index) && (!(g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
-      pbuf_free(tx_buff[i]);
+  while((k64f_enet->tx_consume_index != k64f_enet->tx_produce_index) &&
+        (!(g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
+      pbuf_free(tx_buff[k64f_enet->tx_consume_index % ENET_TX_RING_LEN]);
       if (g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK)
         g_handle.txBdDirty = g_handle.txBdBase;
       else
         g_handle.txBdDirty++;
 
-      i = (i + 1) % ENET_TX_RING_LEN;
+      k64f_enet->tx_consume_index += 1;
+      osSemaphoreRelease(k64f_enet->xTXDCountSem.id);
   }
 
-  k64f_enet->tx_consume_index = i;
   /* Restore access */
   sys_mutex_unlock(&k64f_enet->TXLockMutex);
 }
@@ -524,17 +522,17 @@ static err_t k64f_low_level_output(struct netif *netif, struct pbuf *p)
     dst += q->len;
   }
 
-  /* Wait until a descriptor is available for the transfer. */
-  /* THIS WILL BLOCK UNTIL THERE ARE A DESCRIPTOR AVAILABLE */
-  while (g_handle.txBdCurrent->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK)
-    osSemaphoreWait(k64f_enet->xTXDCountSem.id, osWaitForever);
+  /* Check if a descriptor is available for the transfer. */
+  int32_t count = osSemaphoreWait(k64f_enet->xTXDCountSem.id, 0);
+  if (count < 1)
+    return ERR_BUF;
 
   /* Get exclusive access */
   sys_mutex_lock(&k64f_enet->TXLockMutex);
 
   /* Save the buffer so that it can be freed when transmit is done */
-  tx_buff[k64f_enet->tx_produce_index] = temp_pbuf;
-  k64f_enet->tx_produce_index = (k64f_enet->tx_produce_index + 1) % ENET_TX_RING_LEN;
+  tx_buff[k64f_enet->tx_produce_index % ENET_TX_RING_LEN] = temp_pbuf;
+  k64f_enet->tx_produce_index += 1;
 
   /* Setup transfers */
   g_handle.txBdCurrent->buffer = psend;

features/FEATURE_LWIP/lwip-interface/lwip-sys/arch/cc.h

@@ -54,7 +54,12 @@ typedef uintptr_t          mem_ptr_t;
 #define SZT_F "uz"
 
 /* ARM/LPC17xx is little endian only */
+#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
+#ifdef BYTE_ORDER
+#undef BYTE_ORDER
+#endif
 #define BYTE_ORDER LITTLE_ENDIAN
+#endif
 
 /* Use LWIP error codes */
 #define LWIP_PROVIDE_ERRNO
@@ -92,7 +97,7 @@ typedef uintptr_t          mem_ptr_t;
     #define LWIP_CHKSUM_ALGORITHM   0
 
     void* thumb2_memcpy(void* pDest, const void* pSource, size_t length);
-    u16_t thumb2_checksum(void* pData, int length);
+    u16_t thumb2_checksum(const void* pData, int length);
 #else
     /* Used with IP headers only */
     #define LWIP_CHKSUM_ALGORITHM   1

features/FEATURE_LWIP/lwip-interface/lwip/src/core/lwip_pbuf.c

@@ -1179,6 +1179,7 @@ pbuf_coalesce(struct pbuf *p, pbuf_layer layer)
     return p;
   }
   err = pbuf_copy(q, p);
+  LWIP_UNUSED_ARG(err);
   LWIP_ASSERT("pbuf_copy failed", err == ERR_OK);
   pbuf_free(p);
   return q;