Rebuild on mbed 6.10

Author: facchinm

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/gatt/GattCallbackParamTypes.h

@@ -443,9 +443,33 @@ struct GattDataSentCallbackParams {
 
 };
 
-using GattUpdatesEnabledCallbackParams        = GattDataSentCallbackParams;
-using GattUpdatesDisabledCallbackParams       = GattDataSentCallbackParams;
-using GattConfirmationReceivedCallbackParams  = GattDataSentCallbackParams;
+/**
+ * Gatt Updates Changed Attribute related events
+ *
+ * Used by `onUpdatesEnabled` and 'onUpdatesDisabled'
+ */
+struct GattUpdatesChangedCallbackParams {
+
+    /**
+     * The handle of the connection that triggered the event.
+     */
+    ble::connection_handle_t connHandle;
+
+    /**
+     * The handle of the CCCD producing the event
+     */
+    GattAttribute::Handle_t attHandle;
+
+    /**
+     * The value handle of the characteristic containing the CCCD  
+     */
+    GattAttribute::Handle_t charHandle;
+    
+};
+
+using GattUpdatesEnabledCallbackParams       = GattUpdatesChangedCallbackParams;
+using GattUpdatesDisabledCallbackParams      = GattUpdatesChangedCallbackParams;
+using GattConfirmationReceivedCallbackParams = GattDataSentCallbackParams;
 
 namespace ble {
 

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/services/BatteryService.h

@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/* MBED_DEPRECATED */
+#warning "These services are deprecated and will be removed. Please see services.md for details about replacement services."
+
 #ifndef MBED_BLE_BATTERY_SERVICE_H__
 #define MBED_BLE_BATTERY_SERVICE_H__
 

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/services/DeviceInformationService.h

@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/* MBED_DEPRECATED */
+#warning "These services are deprecated and will be removed. Please see services.md for details about replacement services."
+
 #ifndef __BLE_DEVICE_INFORMATION_SERVICE_H__
 #define __BLE_DEVICE_INFORMATION_SERVICE_H__
 

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/services/EnvironmentalService.h

@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/* MBED_DEPRECATED */
+#warning "These services are deprecated and will be removed. Please see services.md for details about replacement services."
+
 #ifndef __BLE_ENVIRONMENTAL_SERVICE_H__
 #define __BLE_ENVIRONMENTAL_SERVICE_H__
 

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/services/HealthThermometerService.h

@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/* MBED_DEPRECATED */
+#warning "These services are deprecated and will be removed. Please see services.md for details about replacement services."
+
 #ifndef __BLE_HEALTH_THERMOMETER_SERVICE_H__
 #define __BLE_HEALTH_THERMOMETER_SERVICE_H__
 

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/services/HeartRateService.h

@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/* MBED_DEPRECATED */
+#warning "These services are deprecated and will be removed. Please see services.md for details about replacement services."
+
 #ifndef MBED_BLE_HEART_RATE_SERVICE_H__
 #define MBED_BLE_HEART_RATE_SERVICE_H__
 

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/services/LinkLossService.h

@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/* MBED_DEPRECATED */
+#warning "These services are deprecated and will be removed. Please see services.md for details about replacement services."
+
 #ifndef __BLE_LINK_LOSS_SERVICE_H__
 #define __BLE_LINK_LOSS_SERVICE_H__
 

cores/arduino/mbed/connectivity/FEATURE_BLE/libraries/cordio_stack/wsf/include/wsf_trace.h

@@ -26,6 +26,10 @@
 
 #include <stdarg.h>
 
+#if MBED_CONF_CORDIO_TRACE_HCI_PACKETS
+#include "mbed_wsf_trace.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -289,6 +293,7 @@ bool_t WsfTokenService(void);
 /*! \brief 3 argument HCI error trace. */
 #define HCI_TRACE_ERR3(msg, var1, var2, var3)       WSF_TRACE3("HCI", "ERR",  msg, var1, var2, var3)
 
+#if !MBED_CONF_CORDIO_TRACE_HCI_PACKETS
 /*! \brief HCI PDUMP on command. */
 #define HCI_PDUMP_CMD(len, pBuf)
 /*! \brief HCI PDUMP on event. */
@@ -301,6 +306,7 @@ bool_t WsfTokenService(void);
 #define HCI_PDUMP_TX_ISO(len, pBuf)
 /*! \brief HCI PDUMP on Received ISO message. */
 #define HCI_PDUMP_RX_ISO(len, pBuf)
+#endif // !MBED_CONF_CORDIO_TRACE_HCI_PACKETS
 
 /*! \brief 0 argument DM info trace. */
 #define DM_TRACE_INFO0(msg)                         WSF_TRACE0("DM", "INFO", msg)

cores/arduino/mbed/connectivity/FEATURE_BLE/source/common/ble_trace_helpers.h

@@ -0,0 +1,120 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2021 ARM Limited
+ * 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.
+ */
+
+#ifndef BLE_CLIAPP_BLE_TRACE_HELPERS_H
+#define BLE_CLIAPP_BLE_TRACE_HELPERS_H
+
+#include "ble/BLE.h"
+#include "ble/SecurityManager.h"
+#include "mbed-trace/mbed_trace.h"
+#include "pal/GapTypes.h"
+#include "pal/GapEvents.h"
+#include "dm_api.h"
+#include "common/UUID.h"
+
+namespace ble {
+#if MBED_CONF_MBED_TRACE_ENABLE
+void trace_le_supported_features(uint64_t feat);
+
+const char* dm_callback_event_to_string(uint8_t event);
+const char* hci_opcode_to_string(uint16_t opcode);
+const char* attribute_error_code_to_string(uint8_t error);
+const char* attribute_opcode_to_string(uint8_t error);
+const char* ble_error_to_string(ble_error_t error);
+const char* att_client_callback_event_to_string(uint8_t code);
+const char* att_error_code_to_string(uint8_t code);
+#endif //MBED_CONF_MBED_TRACE_ENABLE
+
+template<size_t size>
+const char* to_string(const ble::byte_array_t<size> &array)
+{
+    return (mbed_trace_array)(array.data(), array.size());
+}
+
+const char* to_string(const UUID& uuid);
+
+const char *to_string(bool v);
+
+const char *to_string(ble::SecurityManager::SecurityIOCapabilities_t capabilities);
+
+const char *to_string(ble::io_capability_t capabilities);
+
+const char *to_string(ble::SecurityManager::SecurityMode_t security_mode);
+
+const char *passkey_str(const uint8_t* passkey);
+
+const char *to_string(const ble::address_t& address);
+
+const char *to_string(const ble::link_encryption_t encryption);
+
+const char *to_string(Keypress_t keypress);
+
+const char *to_string(ble::pairing_failure_t reason);
+
+const char *to_string(target_peer_address_type_t type);
+
+const char *to_string(privacy_mode_t mode);
+
+const char *to_string(ble::advertising_type_t advType);
+
+const char *to_string(ble::own_address_type_t addressType);
+
+const char *to_string(ble::advertising_filter_policy_t policy);
+
+const char *to_string(ble::phy_t phy);
+
+const char *to_string(ble::scanning_filter_policy_t policy);
+
+const char *to_string(ble::duplicates_filter_t filtering);
+
+const char *to_string(ble::peer_address_type_t addressType);
+
+const char *to_string(ble::initiator_filter_policy_t policy);
+
+const char *to_string(ble::coded_symbol_per_bit_t sym);
+
+const char *to_string(ble::local_disconnection_reason_t reason);
+
+const char *to_string(ble::advertising_channel_map_t map);
+
+const char *to_string(ble::connection_peer_address_type_t connection_peer_address_type);
+
+const char *to_string(ble::whitelist_address_type_t whitelist_address_type);
+
+const char *to_string(ble::hci_error_code_t error);
+
+const char *to_string(ble::advertising_fragment_description_t fragment_description);
+
+const char *to_string(ble::peripheral_privacy_configuration_t::resolution_strategy_t resolution_strategy);
+
+const char *to_string(ble::GapEventType event_type);
+
+const char *to_string(ble::received_advertising_type_t type);
+
+const char *to_string(ble::connection_role_t role);
+
+const char *to_string(ble::direct_address_type_t direct_address_type);
+
+const char *to_string(ble::advertising_data_status_t data_status);
+
+const char *to_string(ble::att_security_requirement_t security_requirement);
+
+const char *to_string(GattAuthCallbackReply_t authorization_reply);
+
+} // namespace ble
+
+#endif //BLE_CLIAPP_BLE_TRACE_HELPERS_H

cores/arduino/mbed/connectivity/FEATURE_BLE/source/cordio/source/GattServerImpl.h

@@ -293,6 +293,8 @@ class GattServer : public PalSigningMonitor {
 
     bool get_cccd_index_by_value_handle(GattAttribute::Handle_t char_handle, uint8_t &idx) const;
 
+    bool get_value_handle_by_cccd_handle(GattAttribute::Handle_t cccd_handle, GattAttribute::Handle_t &char_handle) const;
+
     bool is_update_authorized(connection_handle_t connection, GattAttribute::Handle_t value_handle);
 
     struct alloc_block_t {

cores/arduino/mbed/connectivity/FEATURE_BLE/source/cordio/stack_adaptation/mbed_wsf_trace.h

@@ -0,0 +1,37 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2021 ARM Limited
+ * 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.
+ */
+
+#ifndef MBED_WSF_TRACE_H_
+#define MBED_WSF_TRACE_H_
+
+#if MBED_CONF_MBED_TRACE_ENABLE
+void wsf_mbed_trace_init();
+
+#if MBED_CONF_CORDIO_TRACE_HCI_PACKETS
+void wsf_mbed_trace_hci(const uint8_t *pBuf, uint32_t len, const uint8_t *prefix);
+
+#define HCI_PDUMP_CMD(len, pBuf)    wsf_mbed_trace_hci(len, pBuf, "CMD")
+#define HCI_PDUMP_EVT(len, pBuf)    wsf_mbed_trace_hci(len, pBuf, "EVT")
+#define HCI_PDUMP_TX_ACL(len, pBuf) wsf_mbed_trace_hci(len, pBuf, "ACL_TX")
+#define HCI_PDUMP_RX_ACL(len, pBuf) wsf_mbed_trace_hci(len, pBuf, "ACL_RX")
+#define HCI_PDUMP_TX_ISO(len, pBuf) wsf_mbed_trace_hci(len, pBuf, "ISO_TX")
+#define HCI_PDUMP_RX_ISO(len, pBuf) wsf_mbed_trace_hci(len, pBuf, "ISO_RX")
+#endif // MBED_CONF_CORDIO_TRACE_HCI_PACKETS
+
+#endif // MBED_CONF_MBED_TRACE_ENABLE
+
+#endif // MBED_WSF_TRACE_H_

cores/arduino/mbed/connectivity/FEATURE_BLE/source/generic/FileSecurityDb.h

@@ -37,9 +37,7 @@ class FileSecurityDb : public SecurityDb {
         size_t file_offset;
     };
 
-    static entry_t* as_entry(entry_handle_t db_handle) {
-        return reinterpret_cast<entry_t*>(db_handle);
-    }
+    static entry_t* as_entry(entry_handle_t db_handle);
 
     template<class T>
     void db_read(T *value, long int offset) {
@@ -161,6 +159,11 @@ class FileSecurityDb : public SecurityDb {
      */
     static FILE* erase_db_file(FILE* db_file);
 
+    uint8_t get_index(const entry_handle_t db_handle) const
+    {
+        return reinterpret_cast<entry_t*>(db_handle) - _entries;
+    }
+
 private:
     entry_t _entries[BLE_SECURITY_DATABASE_MAX_ENTRIES];
     FILE *_db_file;

cores/arduino/mbed/connectivity/FEATURE_BLE/source/generic/GapImpl.h

@@ -907,6 +907,8 @@ class Gap :
 
     ScanState _scan_state = ScanState::idle;
 
+    void set_scan_state(ScanState state);
+
     scan_duration_t _scan_requested_duration = scan_duration_t::forever();
     duplicates_filter_t _scan_requested_filtering = duplicates_filter_t::DISABLE;
     scan_period_t _scan_requested_period = scan_period_t(0);
@@ -989,6 +991,10 @@ class Gap :
 
 
     bool _user_manage_connection_parameter_requests : 1;
+#if BLE_ROLE_OBSERVER
+    bool _scan_parameters_set : 1 = false;
+#endif // BLE_ROLE_OBSERVER
+
 };
 
 } // namespace impl

cores/arduino/mbed/connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.h

@@ -63,10 +63,6 @@ class KVStoreSecurityDb : public SecurityDb {
     static constexpr char DB_VERSION[DB_KEY_SIZE] = { 'v','e','r' };
     static constexpr char DB_RESTORE[DB_KEY_SIZE] = { 'r','e','s' };
 
-    static entry_t* as_entry(entry_handle_t db_handle) {
-        return reinterpret_cast<entry_t*>(db_handle);
-    }
-
     template<class T>
     static void db_read(T *value, const char* key) {
         char db_key[DB_FULL_KEY_SIZE];