Merge pull request #6950 from ARMmbed/release-candidate

Release candidate for mbed-os-5.8.5

Author: adbridge

.github/issue_template.md

@@ -1,48 +1,31 @@
-Note: This is just a template, so feel free to use/remove the unnecessary things
-
 ### Description
-- Type: Bug | Enhancement | Question
-- Related issue: `#abc`
-- Priority: Blocker | Major | Minor
-
----------------------------------------------------------------
-## Bug
-
-**Target**
-K64F|??
-
-**Toolchain:**
-GCC_ARM|ARM|IAR
-
-**Toolchain version:**
-
-**mbed-cli version:** 
-(`mbed --version`)
-
-**mbed-os sha:**
-(`git log -n1 --oneline`)
-
-**DAPLink version:**
-
-**Expected behavior**
-
-**Actual behavior**
-
-**Steps to reproduce**
-
-----------------------------------------------------------------
-## Enhancement
-
-**Reason to enhance or problem with existing solution**
-
-**Suggested enhancement**
-
-**Pros**
-
-**Cons**
-
------------------------------------------------------------------
-
-## Question
+<!-- 
+    Required
+    Add detailed description of what you are reporting.
+    Good example: https://os.mbed.com/docs/latest/reference/workflow.html
+    Things to consider sharing:
+    - What target does this relate to?
+    - What toolchain (name + version) are you using?
+    - What tools (name + version - is it mbed-cli, online compiler or IDE) are you using?
+    - What is the SHA of Mbed OS (git log -n1 --oneline)?
+    - Steps to reproduce. (Did you publish code or a test case that exhibits the problem?)
+-->
+
+
+### Issue request type
+<!-- 
+    Required
+    Please add only one X to one of the following types. Do not fill multiple types. (Split the issue otherwise.)
+    Please note this is not a GitHub task list; indenting the boxes or changing the format to add a '.' or '*' in front
+    of them changes the meaning incorrectly. The only changes to make are to add a description under the
+    description heading and to add an 'x' to the correct box.
+
+    [X] Question
+    [ ] Enhancement 
+    [ ] Bug 
+-->
+
+[ ] Question  
+[ ] Enhancement  
+[ ] Bug  
 
-**How to?**

TESTS/mbed_drivers/flashiap/main.cpp

@@ -22,6 +22,7 @@
 #include "utest/utest.h"
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
+#include <algorithm>
 
 #include "mbed.h"
 
@@ -48,10 +49,10 @@ void flashiap_program_test()
     TEST_ASSERT_NOT_EQUAL(0, sector_size);
     TEST_ASSERT_NOT_EQUAL(0, page_size);
     TEST_ASSERT_TRUE(sector_size % page_size == 0);
-    const uint8_t test_value = 0xCE;
-    uint8_t *data = new uint8_t[page_size];
-    for (uint32_t i = 0; i < page_size; i++) {
-        data[i] = test_value;
+    uint32_t prog_size = std::max(page_size, (uint32_t)8);
+    uint8_t *data = new uint8_t[prog_size + 2];
+    for (uint32_t i = 0; i < prog_size + 2; i++) {
+        data[i] = i;
     }
 
     // the one before the last sector in the system
@@ -61,19 +62,29 @@ void flashiap_program_test()
     TEST_ASSERT_EQUAL_INT32(0, ret);
 
 
-    for (uint32_t i = 0; i < sector_size / page_size; i++) {
-        uint32_t page_addr = address + i * page_size;
-        ret = flash_device.program(data, page_addr, page_size);
+    for (uint32_t i = 0; i < sector_size / prog_size; i++) {
+        uint32_t prog_addr = address + i * prog_size;
+        ret = flash_device.program(data, prog_addr, prog_size);
         TEST_ASSERT_EQUAL_INT32(0, ret);
     }
 
-    uint8_t *data_flashed = new uint8_t[page_size];
-    for (uint32_t i = 0; i < sector_size / page_size; i++) {
-        uint32_t page_addr = address + i * page_size;
-        ret = flash_device.read(data_flashed, page_addr, page_size);
+    uint8_t *data_flashed = new uint8_t[prog_size];
+    for (uint32_t i = 0; i < sector_size / prog_size; i++) {
+        uint32_t page_addr = address + i * prog_size;
+        ret = flash_device.read(data_flashed, page_addr, prog_size);
         TEST_ASSERT_EQUAL_INT32(0, ret);
-        TEST_ASSERT_EQUAL_UINT8_ARRAY(data, data_flashed, page_size);
+        TEST_ASSERT_EQUAL_UINT8_ARRAY(data, data_flashed, prog_size);
     }
+
+    // check programming of unaligned buffer and size
+    ret = flash_device.erase(address, sector_size);
+    TEST_ASSERT_EQUAL_INT32(0, ret);
+    ret = flash_device.program(data + 2, address, prog_size);
+    TEST_ASSERT_EQUAL_INT32(0, ret);
+    ret = flash_device.read(data_flashed, address, prog_size - 1);
+    TEST_ASSERT_EQUAL_INT32(0, ret);
+    TEST_ASSERT_EQUAL_UINT8_ARRAY(data + 2, data_flashed, prog_size - 1);
+
     delete[] data;
     delete[] data_flashed;
 

TESTS/mbed_drivers/rtc/main.cpp

@@ -144,7 +144,7 @@ void test_attach_RTC_stub_funtions()
     TEST_ASSERT_EQUAL(false, rtc_init_called);
 
     /* Check if time has been successfully set and retrieved. */
-    TEST_ASSERT_EQUAL(CUSTOM_TIME_1, seconds);
+    TEST_ASSERT_UINT32_WITHIN(RTC_DELTA, CUSTOM_TIME_1, seconds);
 }
 
 /* This test verifies if attach_rtc provides availability to
@@ -183,7 +183,7 @@ void test_attach_RTC_org_funtions()
     TEST_ASSERT_EQUAL(false, rtc_init_called);
 
     /* Check if time has been successfully set and retrieved. */
-    TEST_ASSERT_EQUAL(CUSTOM_TIME_1, seconds);
+    TEST_ASSERT_UINT32_WITHIN(RTC_DELTA, CUSTOM_TIME_1, seconds);
 }
 
 /* This test verifies if time() function returns
@@ -430,7 +430,7 @@ void test_functional_set()
     set_time(timeValue);
 
     /* Get current time and verify that new value has been set. */
-    TEST_ASSERT_EQUAL(timeValue, time(NULL));
+    TEST_ASSERT_UINT32_WITHIN(1, timeValue, time(NULL));
 }
 
 /* This test verifies if RTC counts seconds.

drivers/FlashIAP.cpp

@@ -107,10 +107,18 @@ int FlashIAP::program(const void *buffer, uint32_t addr, uint32_t size)
     _mutex->lock();
     while (size) {
         uint32_t current_sector_size = flash_get_sector_size(&_flash, addr);
+        bool unaligned_src = (((size_t) buf / sizeof(uint32_t) * sizeof(uint32_t)) != (size_t) buf);
         chunk = std::min(current_sector_size - (addr % current_sector_size), size);
-        if (chunk < page_size) {
+        // Need to use the internal page buffer in any of these two cases:
+        // 1. Size is not page aligned
+        // 2. Source buffer is not aligned to uint32_t. This is not supported by many targets (although
+        //    the pointer they accept is of uint8_t).
+        if (unaligned_src || (chunk < page_size)) {
+            chunk = std::min(chunk, page_size);
             memcpy(_page_buf, buf, chunk);
-            memset(_page_buf + chunk, 0xFF, page_size - chunk);
+            if (chunk < page_size) {
+                memset(_page_buf + chunk, 0xFF, page_size - chunk);
+            }
             prog_buf = _page_buf;
             prog_size = page_size;
         } else {

features/FEATURE_BLE/ble/generic/GenericSecurityManager.h

@@ -354,8 +354,8 @@ class GenericSecurityManager : public SecurityManager,
      * @return true if cryptography functioned worked
      */
     static bool crypto_toolbox_f4(
-        const public_key_t &U,
-        const public_key_t &V,
+        const public_key_coord_t &U,
+        const public_key_coord_t &V,
         const oob_lesc_value_t &X,
         oob_confirm_t &confirm
     );

features/FEATURE_BLE/source/generic/GenericGattClient.cpp

@@ -147,6 +147,7 @@ struct GenericGattClient::DiscoveryControlBlock : public ProcedureControlBlock {
 				const AttErrorResponse& error = static_cast<const AttErrorResponse&>(message);
 				if (error.error_code != AttErrorResponse::ATTRIBUTE_NOT_FOUND) {
 					terminate(client);
+					return;
 				}
 
 				switch (error.request_opcode) {

features/FEATURE_BLE/targets/TARGET_CORDIO/doc/PortingGuide.md

@@ -37,37 +37,6 @@ property of the target.
     }
 ```
 
-### Include prebuilt libraries 
-
-Last, the target shall also include the cordio libraries into the build. 
-
-Four prebuilt libraries are provided: 
-* `wscore`: which contains the base component used by the Cordio stack.
-* `wsstack`: The BLE stack itself, if contains the GAP and GATT layer as well as 
-the Security manager implementation.
-* `wssec`: The low level implementation of the security layer.
-* `wshci`: The HCI layer.
-
-The `wssec` and `wshci` libraries are delivered in feature folders. It allows 
-vendors to override those library if necessary. This can be required if the port 
-use specific crypto routine or require an highly modified HCI layer. 
-
-To include the default library in the target, the features have to be added in 
-this list of the features of the target: 
-* `WSSEC`: Include the default `wssec` library.
-* `WSHCI`: Include the default `wshci` library.
-
-The target should also compile the sources of the BLE Cordio port. It is 
-achieved by adding the string `CORDIO` in the list of the `extra_labels` 
-property of the target. 
-
-```json
-    "TARGET_NAME": {
-        "extra_labels": ["target extra labels ...", "CORDIO"],
-        "features": ["target features ...", "BLE", "WSHCI", "WSSEC"]
-    }
-```
-
 ## CordioHCIDriver implementation: 
 
 A port shall include an HCI driver for the BLE module used by the target and 
@@ -93,8 +62,10 @@ More information about the architecture can be found in the
 
 #### HCITransport 
 
-> **Note:** If the Bluetooth controller uses an H4 communication interface, this 
-step can be skipped.
+> **Note:** If the Bluetooth controller uses an H4 communication interface and
+the host exposes serial flow control in mbed then this step can be skipped and
+the class `ble::vendor::cordio::H4TransportDriver` can be used as the transport
+driver.
 
 An empty transport driver can be coded as: 
 
@@ -518,22 +489,6 @@ ble::vendor::cordio::CordioHCIDriver& ble_cordio_get_hci_driver() {
 }
 ```
 
-## Examples
-
-Implementation examples might be found for: 
-* [ST BlueNRG module](../../TARGET_NUCLEO_F401RE/BlueNrgHCIDriver.cpp): It uses
-a custom transport driver and a vendor specific is sent right after the answer 
-to the reset command to switch the controller to link layer mode only.
-* [EM9301 module](../../TARGET_Maxim/TARGET_MAX32620HSP/EM9301HCIDriver.cpp): 
-it uses a custom transport driver and doesn't doesn't send the command *Set 
-Event Mask Page 2*  to the controller during the reset sequence because this 
-command is not supported by the controller.
-* [PAN1326](../../TARGET_Maxim/TARGET_MAX32630FTHR/CC2564HCIDriver.cpp): It 
-uses the H4 transport driver. The reset sequence start by sending a 
-*service pack* then once the service pack has been transferred it continue 
-with the regular reset sequence.
-
-
 
 
 

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

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#if DEVICE_SERIAL && DEVICE_SERIAL_FC
+
 #include "H4TransportDriver.h"
 
 namespace ble {
@@ -68,3 +70,5 @@ void H4TransportDriver::on_controller_irq()
 } // namespace cordio
 } // namespace vendor
 } // namespace ble
+
+#endif

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

@@ -17,6 +17,8 @@
 #ifndef CORDIO_H4_TRANSPORT_DRIVER_H_
 #define CORDIO_H4_TRANSPORT_DRIVER_H_
 
+#if (DEVICE_SERIAL && DEVICE_SERIAL_FC) || defined(DOXYGEN_ONLY)
+
 #include <stdint.h>
 #include "mbed.h"
 #include "CordioHCITransportDriver.h"
@@ -27,6 +29,9 @@ namespace cordio {
 
 /**
  * Implementation of the H4 driver.
+ *
+ * @note This HCI transport implementation is not accessible to devices that do
+ * not expose serial flow control.
  */
 class H4TransportDriver : public CordioHCITransportDriver {
 public:
@@ -73,4 +78,6 @@ class H4TransportDriver : public CordioHCITransportDriver {
 } // namespace vendor
 } // namespace ble
 
+#endif
+
 #endif /* CORDIO_H4_TRANSPORT_DRIVER_H_ */

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/hal_patch/critical_section_api.c

@@ -72,7 +72,7 @@ void hal_critical_section_exit(void)
 
     // Restore the state as it was prior to entering the critical section.
     if (_use_softdevice_routine) {
-        sd_nvic_critical_region_exit(_state._sd_state)
+        sd_nvic_critical_region_exit(_state._sd_state);
     } else {
         __set_PRIMASK(_state._PRIMASK_state);
     }