squashme: Rebuild mbed and PORTENTA_H7 target

Author: facchinm

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/gap/ChainableGapEventHandler.h

@@ -41,6 +41,10 @@ class ChainableGapEventHandler : public ble::Gap::EventHandler,
         execute_on_all(&ble::Gap::EventHandler::onScanRequestReceived, event);
     }
 
+    void onAdvertisingStart(const ble::AdvertisingStartEvent &event) override {
+        execute_on_all(&ble::Gap::EventHandler::onAdvertisingStart, event);
+    }
+
     void onAdvertisingEnd(const ble::AdvertisingEndEvent &event) override {
         execute_on_all(&ble::Gap::EventHandler::onAdvertisingEnd, event);
     }
@@ -112,6 +116,10 @@ class ChainableGapEventHandler : public ble::Gap::EventHandler,
                 connectionHandle, txSize, rxSize);
     }
 
+    void onPrivacyEnabled() override {
+        execute_on_all(&ble::Gap::EventHandler::onPrivacyEnabled);
+    }
+
 };
 
 #endif /* MBED_CHAINABLEGAPEVENTHANDLER_H_ */

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack/ws_bbr_api.h

@@ -334,6 +334,19 @@ int ws_bbr_pan_configuration_get(int8_t interface_id, uint16_t *pan_id);
  */
 int ws_bbr_pan_configuration_validate(int8_t interface_id, uint16_t pan_id);
 
+/**
+ * Sets Wi-SUN BSI
+ *
+ * Sets Wi-SUN PAN BSI.
+ *
+ * \param interface_id Network interface ID.
+ * \param new_bsi Identifier.
+ *
+ * \return 0, PAN BSI set.
+ * \return <0 PAN BSI set failed.
+ */
+int ws_bbr_bsi_set(int8_t interface_id, uint16_t new_bsi);
+
 /**
  * Sets memory used for key storages
  *

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack/ws_management_api.h

@@ -382,6 +382,8 @@ int ws_management_channel_plan_set(
  *
  * Change the default configuration for Wi-SUN FHSS operation.
  *
+ * Calling with fhss_uc_dwell_interval = 0, fhss_broadcast_interval = 0xffffffff,
+ * fhss_bc_dwell_interval = 0 restores stack defaults
  *
  * \param interface_id Network interface ID.
  * \param fhss_uc_dwell_interval default to 250 ms.
@@ -403,6 +405,7 @@ int ws_management_fhss_timing_configure(
  * Change the default configuration for Wi-SUN FHSS operation.
  * if application defined is used the behaviour is undefined
  *
+ * Calling with dwell_interval = 0, channel_function = 0xff, fixed_channel = 0xffff restores stack defaults
  *
  * \param interface_id Network interface ID.
  * \param channel_function Unicast channel function.
@@ -458,6 +461,8 @@ int ws_management_fhss_unicast_channel_function_validate(
  * Change the default configuration for Wi-SUN FHSS operation.
  * if application defined is used the behaviour is undefined
  *
+ * Calling with dwell_interval = 0, channel_function = 0xff,
+ * broadcast_interval = 0xffffffff, fixed_channel = 0xffff restores stack defaults
  *
  * \param interface_id Network interface ID.
  * \param channel_function Broadcast channel function.

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api_internal.h

@@ -37,6 +37,9 @@ bool ws_bbr_ready_to_start(protocol_interface_info_entry_t *cur);
 
 bool ws_bbr_backbone_address_get(uint8_t *address);
 
+uint16_t ws_bbr_bsi_generate(protocol_interface_info_entry_t *interface);
+void ws_bbr_init(protocol_interface_info_entry_t *interface);
+
 #else
 
 #define ws_bbr_seconds_timer( cur, seconds)
@@ -46,6 +49,8 @@ bool ws_bbr_backbone_address_get(uint8_t *address);
 #define ws_bbr_dhcp_address_lifetime_set(cur, dhcp_address_lifetime)
 #define ws_bbr_ready_to_start(cur) true
 #define ws_bbr_backbone_address_get(address) 0
+#define ws_bbr_bsi_generate(interface) 0
+#define ws_bbr_init(interface) (void) 0
 
 #endif //HAVE_WS_BORDER_ROUTER
 

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.h

@@ -56,12 +56,12 @@ typedef struct ws_timing_cfg_s {
  * \brief Struct ws_rpl_cfg_t RPL configuration
  */
 typedef struct ws_bbr_cfg_s {
-    uint8_t dio_interval_min;           /**> DIO interval min; DEFAULT_DIO_INTERVAL_MIN; 2^value in milliseconds; range 1-255; default */
-    uint8_t dio_interval_doublings;     /**> DIO interval doublings; DEFAULT_DIO_INTERVAL_DOUBLINGS; range 1-8; default */
-    uint8_t dio_redundancy_constant;    /**> DIO redundancy constant; DEFAULT_DIO_REDUNDANCY_CONSTANT; range 0-10; default */
+    uint8_t dio_interval_min;           /**< DIO interval min; DEFAULT_DIO_INTERVAL_MIN; 2^value in milliseconds; range 1-255; default */
+    uint8_t dio_interval_doublings;     /**< DIO interval doublings; DEFAULT_DIO_INTERVAL_DOUBLINGS; range 1-8; default */
+    uint8_t dio_redundancy_constant;    /**< DIO redundancy constant; DEFAULT_DIO_REDUNDANCY_CONSTANT; range 0-10; default */
     uint16_t dag_max_rank_increase;
     uint16_t min_hop_rank_increase;
-    uint32_t dhcp_address_lifetime;     /**> DHCP address lifetime in seconds minimum 2 hours and maximum as days hours*/
+    uint32_t dhcp_address_lifetime;     /**< DHCP address lifetime in seconds minimum 2 hours and maximum as days hours*/
 } ws_bbr_cfg_t;
 
 /**

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.h

@@ -73,6 +73,11 @@ typedef struct {
     uint8_t index;
 } ws_pending_key_index_t;
 
+typedef struct {
+    uint32_t block_time;
+    uint16_t old_bsi;
+} ws_bsi_block_t;
+
 typedef NS_LIST_HEAD(ws_nud_table_entry_t, link) ws_nud_table_list_t;
 
 typedef struct ws_info_s {
@@ -89,6 +94,7 @@ typedef struct ws_info_s {
     parent_info_t parent_info[WS_PARENT_LIST_SIZE];
     parent_info_list_t parent_list_free;
     parent_info_list_t parent_list_reserved;
+    ws_bsi_block_t ws_bsi_block;
     uint16_t aro_registration_timer;       /**< Aro registration timer */
     uint16_t rpl_version_timer;            /**< RPL version update timeout */
     uint32_t pan_timeout_timer;    /**< routers will fallback to previous state after this */

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_config.h

@@ -130,14 +130,37 @@ extern uint8_t DEVICE_MIN_SENS;
 
 
 /* Multicast MPL data message parameters
- * IMIN = 10 seconds, IMAX = 3 doublings
  */
-
-#define DATA_MESSAGE_IMIN 10
-#define DATA_MESSAGE_TIMER_EXPIRATIONS 3
-#define DATA_MESSAGE_IMAX 80
-#define DATA_MESSAGE_K 8
-#define MPL_SEED_SET_ENTRY_TIMEOUT (DATA_MESSAGE_IMAX * 24 * 4) // 10 seconds per hop making this 240 seconds
+#define MPL_SAFE_HOP_COUNT 6
+
+/*Border router override to optimize the multicast startup*/
+#define MPL_BORDER_ROUTER_MIN_EXPIRATIONS 2
+#define MPL_BORDER_ROUTER_MAXIMUM_IMAX 40
+
+/*Small network size*/
+#define MPL_SMALL_IMIN 1
+#define MPL_SMALL_IMAX 10
+#define MPL_SMALL_EXPIRATIONS 1
+#define MPL_SMALL_K 8
+#define MPL_SMALL_SEED_LIFETIME (MPL_SMALL_IMAX * MPL_SAFE_HOP_COUNT * (MPL_SMALL_EXPIRATIONS + 1)) // time that packet should get to safe distance
+/*Medium network size*/
+#define MPL_MEDIUM_IMIN 5
+#define MPL_MEDIUM_IMAX 20
+#define MPL_MEDIUM_EXPIRATIONS 2
+#define MPL_MEDIUM_K 8
+#define MPL_MEDIUM_SEED_LIFETIME (MPL_MEDIUM_IMAX * MPL_SAFE_HOP_COUNT * (MPL_MEDIUM_EXPIRATIONS + 1)) // time that packet should get to safe distance
+/*Large network size*/
+#define MPL_LARGE_IMIN 5
+#define MPL_LARGE_IMAX 40
+#define MPL_LARGE_EXPIRATIONS 2
+#define MPL_LARGE_K 8
+#define MPL_LARGE_SEED_LIFETIME (MPL_LARGE_IMAX * MPL_SAFE_HOP_COUNT * (MPL_LARGE_EXPIRATIONS + 1)) // time that packet should get to safe distance
+/*xtra large network size*/
+#define MPL_XLARGE_IMIN 10
+#define MPL_XLARGE_IMAX 80
+#define MPL_XLARGE_EXPIRATIONS 2
+#define MPL_XLARGE_K 8
+#define MPL_XLARGE_SEED_LIFETIME (MPL_XLARGE_IMAX * MPL_SAFE_HOP_COUNT * (MPL_XLARGE_EXPIRATIONS + 1)) // time that packet should get to safe distance
 
 /* DHCP client timeout configuration values
  *

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.h

@@ -153,6 +153,14 @@ bool ws_pae_key_storage_supp_delete(const void *instance, const uint8_t *eui64);
  */
 void ws_pae_key_storage_timer(uint16_t seconds);
 
+/**
+ * ws_pae_key_storage_fast_timer key storage fast timers
+ *
+ * \param ticks Ticks passed
+ *
+ */
+void ws_pae_key_storage_fast_timer(uint16_t ticks);
+
 /**
  * ws_pae_key_storage_storing_interval_get gets key storage storing interval
  *

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.h

@@ -49,6 +49,24 @@
 // key storage index bitfield (8)
 #define PAE_NVM_KEY_STORAGE_INDEX_LEN    8
 
+typedef struct nw_info_nvm_tlv {
+    uint16_t tag;                             /**< Unique tag */
+    uint16_t len;                             /**< Number of the bytes after the length field */
+    uint8_t data[PAE_NVM_NW_INFO_LEN];        /**< Data */
+} nw_info_nvm_tlv_t;
+
+typedef struct keys_nvm_tlv {
+    uint16_t tag;                             /**< Unique tag */
+    uint16_t len;                             /**< Number of the bytes after the length field */
+    uint8_t data[PAE_NVM_KEYS_LEN];           /**< Data */
+} keys_nvm_tlv_t;
+
+typedef struct frame_cnt_nvm_tlv {
+    uint16_t tag;                             /**< Unique tag */
+    uint16_t len;                             /**< Number of the bytes after the length field */
+    uint8_t data[PAE_NVM_FRAME_COUNTER_LEN];  /**< Data */
+} frame_cnt_nvm_tlv_t;
+
 /**
  * ws_pae_nvm_store_generic_tlv_create create NVM generic storage TLV
  *
@@ -77,7 +95,7 @@ void ws_pae_nvm_store_generic_tlv_free(nvm_tlv_t *tlv_entry);
  * \return TLV entry or NULL
  *
  */
-void ws_pae_nvm_store_nw_info_tlv_create(nvm_tlv_t *tlv_entry, uint16_t pan_id, char *nw_name, sec_prot_gtk_keys_t *gtks);
+void ws_pae_nvm_store_nw_info_tlv_create(nw_info_nvm_tlv_t *tlv_entry, uint16_t pan_id, char *nw_name, sec_prot_gtk_keys_t *gtks);
 
 /**
  * ws_pae_nvm_store_nw_info_tlv_read read from NVM network info TLV
@@ -91,7 +109,7 @@ void ws_pae_nvm_store_nw_info_tlv_create(nvm_tlv_t *tlv_entry, uint16_t pan_id,
  * \return >= 0 success
  *
  */
-int8_t ws_pae_nvm_store_nw_info_tlv_read(nvm_tlv_t *tlv_entry, uint16_t *pan_id, char *nw_name, sec_prot_gtk_keys_t *gtks);
+int8_t ws_pae_nvm_store_nw_info_tlv_read(nw_info_nvm_tlv_t *tlv_entry, uint16_t *pan_id, char *nw_name, sec_prot_gtk_keys_t *gtks);
 
 /**
  * ws_pae_nvm_store_keys_tlv_create create NVM keys TLV
@@ -100,7 +118,7 @@ int8_t ws_pae_nvm_store_nw_info_tlv_read(nvm_tlv_t *tlv_entry, uint16_t *pan_id,
  * \param sec_keys security keys
  *
  */
-void ws_pae_nvm_store_keys_tlv_create(nvm_tlv_t *tlv_entry, sec_prot_keys_t *sec_keys);
+void ws_pae_nvm_store_keys_tlv_create(keys_nvm_tlv_t *tlv_entry, sec_prot_keys_t *sec_keys);
 
 /**
  * ws_pae_nvm_store_nw_info_tlv_read read from NVM keys TLV
@@ -112,7 +130,7 @@ void ws_pae_nvm_store_keys_tlv_create(nvm_tlv_t *tlv_entry, sec_prot_keys_t *sec
  * \return >= 0 success
  *
  */
-int8_t ws_pae_nvm_store_keys_tlv_read(nvm_tlv_t *tlv_entry, sec_prot_keys_t *sec_keys);
+int8_t ws_pae_nvm_store_keys_tlv_read(keys_nvm_tlv_t *tlv_entry, sec_prot_keys_t *sec_keys);
 
 /**
  * ws_pae_nvm_store_frame_counter_tlv_create create NVM frame counter TLV
@@ -123,7 +141,7 @@ int8_t ws_pae_nvm_store_keys_tlv_read(nvm_tlv_t *tlv_entry, sec_prot_keys_t *sec
  * \param counters frame counters
  *
  */
-void ws_pae_nvm_store_frame_counter_tlv_create(nvm_tlv_t *tlv_entry, uint32_t restart_cnt, uint16_t pan_version, frame_counters_t *counters);
+void ws_pae_nvm_store_frame_counter_tlv_create(frame_cnt_nvm_tlv_t *tlv_entry, uint32_t restart_cnt, uint16_t pan_version, frame_counters_t *counters);
 
 /**
  * ws_pae_nvm_store_frame_counter_tlv_read read from NVM frame counter TLV
@@ -138,7 +156,7 @@ void ws_pae_nvm_store_frame_counter_tlv_create(nvm_tlv_t *tlv_entry, uint32_t re
  * \return >= 0 success
  *
  */
-int8_t ws_pae_nvm_store_frame_counter_tlv_read(nvm_tlv_t *tlv_entry, uint32_t *restart_cnt, uint64_t *stored_time, uint16_t *pan_version, frame_counters_t *counters);
+int8_t ws_pae_nvm_store_frame_counter_tlv_read(frame_cnt_nvm_tlv_t *tlv_entry, uint32_t *restart_cnt, uint64_t *stored_time, uint16_t *pan_version, frame_counters_t *counters);
 
 /**
  * ws_pae_nvm_store_key_storage_index_tlv_create create NVM key storage index TLV

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.h

@@ -40,8 +40,8 @@ typedef struct nvm_tlv {
 
 typedef struct {
     nvm_tlv_t nvm_tlv;                  /**< NVM TLV */
-    uint64_t reference_time;            /**< Reference time used for timers (set when file is created) */
     uint32_t reference_restart_cnt;     /**< Reference re-start counter set when file is created) */
+    uint64_t reference_time;            /**< Reference time used for timers (set when file is created) */
 } key_storage_nvm_tlv_entry_t;
 
 // tag + length

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_socket.h

@@ -130,7 +130,7 @@ typedef struct socket {
     int8_t    id;                     /*!< socket id */
     uint8_t   flags;                  /*!< Socket option flags */
     int8_t    tasklet;                /*!< Receiver tasklet */
-    uint8_t   refcount;
+    uint16_t   refcount;
     socket_family_t family;
     socket_type_t type;
     int8_t    default_interface_id;

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h

@@ -26,6 +26,7 @@
 
 struct protocol_interface_rf_mac_setup;
 struct arm_phy_sap_msg_s;
+struct mac_fcf_sequence_s;
 
 #define ENHANCED_ACK_NEIGHBOUR_POLL_MAX_TIME_US 3500
 
@@ -61,4 +62,6 @@ void mac_pd_sap_state_machine(struct protocol_interface_rf_mac_setup *rf_mac_set
 
 int8_t mac_data_edfe_force_stop(struct protocol_interface_rf_mac_setup *rf_ptr);
 
+bool mac_pd_sap_ack_validation(struct protocol_interface_rf_mac_setup *rf_ptr, const struct mac_fcf_sequence_s *fcf_dsn, const uint8_t *data_ptr);
+
 #endif /* MAC_PD_SAP_H_ */

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.h

@@ -46,6 +46,7 @@ void rpl_instance_parent_address_reg_timer_update(struct rpl_instance *instance,
 void rpl_instance_send_address_registration(rpl_instance_t *instance, const uint8_t addr[16]);
 bool rpl_instance_address_registration_done(protocol_interface_info_entry_t *interface, rpl_instance_t *instance, rpl_neighbour_t *neighbour, uint8_t status);
 struct rpl_dao_target *rpl_instance_get_active_target_confirmation(struct rpl_instance *instance);
+bool rpl_instance_parent_selection_ready(struct rpl_instance *instance);
 
 #ifdef HAVE_RPL_DAO_HANDLING
 bool rpl_instance_dao_received(struct rpl_instance *instance, const uint8_t src[16], int8_t interface_id, bool multicast, const uint8_t *opts, uint16_t opts_len, uint8_t *status_out);

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.h

@@ -40,6 +40,8 @@ struct fhss_ws {
     int32_t drift_per_millisecond_ns;
     int16_t *tr51_channel_table;
     uint8_t *tr51_output_table;
+    uint32_t next_uc_timeout;
+    uint32_t next_bc_timeout;
     bool unicast_timer_running;
     bool broadcast_timer_running;
     bool is_on_bc_channel;

cores/arduino/mbed/connectivity/nanostack/sal-stack-nanostack/source/nsconfig.h

@@ -54,6 +54,13 @@
 #endif
 #endif /* HAVE_WS */
 
+/* Configure trace level for Nanostack */
+#ifdef MBED_CONF_NANOSTACK_TRACE_MAX_LEVEL
+#ifdef MBED_TRACE_MAX_LEVEL
+#undef MBED_TRACE_MAX_LEVEL
+#endif /* MBED_TRACE_MAX_LEVEL */
+#define MBED_TRACE_MAX_LEVEL MBED_CONF_NANOSTACK_TRACE_MAX_LEVEL
+#endif /* MBED_CONF_NANOSTACK_TRACE_MAX_LEVEL */
 
 #endif // ifndef _NANOSTACK_SOURCE_CONFIG_H
 

cores/arduino/mbed/drivers/include/drivers/internal/SFDP.h

@@ -129,7 +129,7 @@ int sfdp_detect_erase_types_inst_and_size(uint8_t *bptbl_ptr, sfdp_hdr_info &sfd
  *
  * @return Region number
  */
-int sfdp_find_addr_region(bd_size_t offset, const sfdp_hdr_info &sfdp_info);
+int sfdp_find_addr_region(bd_addr_t offset, const sfdp_hdr_info &sfdp_info);
 
 /** Finds the largest Erase Type of the Region to which the offset belongs to
  *

cores/arduino/mbed/platform/include/platform/internal/SysTimer.h

@@ -191,7 +191,7 @@ class SysTimer: private mbed::TimerEvent, private mbed::NonCopyable<SysTimer<Per
      */
     std::chrono::duration<int, period> unacknowledged_ticks() const
     {
-        return std::chrono::duration<int, period>(core_util_atomic_load_u8(&_unacknowledged_ticks));
+        return std::chrono::duration<int, period>(core_util_atomic_load_u32(&_unacknowledged_ticks));
     }
 
     /** Get the current tick count
@@ -248,7 +248,7 @@ class SysTimer: private mbed::TimerEvent, private mbed::NonCopyable<SysTimer<Per
     const highres_time_point _epoch;
     highres_time_point _time;
     uint64_t _tick;
-    uint8_t _unacknowledged_ticks;
+    uint32_t _unacknowledged_ticks;
     bool _wake_time_set;
     bool _wake_time_passed;
     bool _wake_early;

cores/arduino/mbed/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h

@@ -18,7 +18,7 @@
 #define MBED_SPIF_BLOCK_DEVICE_H
 
 #include "platform/SingletonPtr.h"
-#include "drivers/SPI.h"
+#include "drivers/SPIMaster.h"
 #include "drivers/DigitalOut.h"
 #include "drivers/internal/SFDP.h"
 #include "blockdevice/BlockDevice.h"

cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/inc/whd_version.h

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2020 Cypress Semiconductor Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #define WHD_VERSION "v1.91.2"
 #define WHD_BRANCH "v1.91.2"
 #define WHD_DATE "2020-06-25 02:15:47 -0500"

cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/PinNames.h

@@ -2,6 +2,8 @@
  *******************************************************************************
  * Copyright (c) 2018, STMicroelectronics
  * Copyright (c) 2020, Arduino SA
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without