review fixes

Author: paul-szczepanek-arm

connectivity/FEATURE_BLE/include/ble/BLE.h

@@ -188,9 +188,10 @@ class BLE {
      * @return A reference to a single object.
      *
      * @pre id shall be less than NUM_INSTANCES.
-     * @deprecated BLE singleton supports one instance. You may create multiple instances by using the constructor.
-     * Please use BLE::Instance().
+     *
      */
+    MBED_DEPRECATED_SINCE("mbed-os-6.3.0", "BLE singleton supports one instance. You may create multiple"
+                          "instances by using the constructor. Please use BLE::Instance().")
     static BLE &Instance(InstanceID_t id)
     {
         return Instance();
@@ -200,8 +201,9 @@ class BLE {
      * Fetch the ID of a BLE instance.
      *
      * @return Instance id of this BLE instance.
-     * @deprecated BLE singleton supports one instance. You may create multiple instances by using the constructor.
      */
+    MBED_DEPRECATED_SINCE("mbed-os-6.3.0", "BLE singleton supports one instance. You may create multiple"
+                          "instances by using the constructor.")
     InstanceID_t getInstanceID(void) const
     {
         return DEFAULT_INSTANCE;

connectivity/FEATURE_BLE/include/ble/Gap.h

@@ -555,7 +555,7 @@ class Gap {
     /**
      * Preferred connection parameter display in Generic Access Service.
      */
-    typedef struct PreferredConnectionParams_t {
+    typedef struct {
         /**
          * Minimum interval between two connection events allowed for a
          * connection.

connectivity/FEATURE_BLE/include/ble/GattServer.h

@@ -33,15 +33,7 @@
 
 #include "ble/BLE.h"
 
-/*! Maximum count of characteristics that can be stored for authorisation purposes */
-#define MAX_CHARACTERISTIC_AUTHORIZATION_CNT 20
-
-/*! client characteristic configuration descriptors settings */
-#define MAX_CCCD_CNT 20
-
 namespace ble {
-class PalAttClient;
-class BLE;
 
 /**
  * @addtogroup ble

connectivity/FEATURE_BLE/include/ble/SecurityManager.h

@@ -921,15 +921,9 @@ class SecurityManager
 
 public:
 #if !defined(DOXYGEN_ONLY)
-    /** For backwards compatibility. This enm is now in BLETypes.h
-     * @deprecated, use the enum in ble namespace */
-    enum Keypress_t {
-        KEYPRESS_STARTED,   /**< Passkey entry started */
-        KEYPRESS_ENTERED,   /**< Passkey digit entered */
-        KEYPRESS_ERASED,    /**< Passkey digit erased */
-        KEYPRESS_CLEARED,   /**< Passkey cleared */
-        KEYPRESS_COMPLETED, /**< Passkey entry completed */
-    };
+    /** For backwards compatibility. This enum is now in BLETypes.h
+     * @deprecated use the enum in ble namespace */
+    typedef ble::Keypress_t Keypress_t;
 #endif // !defined(DOXYGEN_ONLY)
 };
 

connectivity/FEATURE_BLE/include/ble/internal/BLEInstanceBase.h

@@ -27,11 +27,6 @@
 
 namespace ble {
 
-class SecurityManager;
-class Gap;
-class GattClient;
-class GattServer;
-
 /**
  * @addtogroup ble
  * @{

connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattServerImpl.h

@@ -37,12 +37,6 @@
 #include "ble/types/GattCallbackParamTypes.h"
 #include "ble/internal/PalSigningMonitor.h"
 
-/*! Maximum count of characteristics that can be stored for authorisation purposes */
-#define MAX_CHARACTERISTIC_AUTHORIZATION_CNT 20
-
-/*! client characteristic configuration descriptors settings */
-#define MAX_CCCD_CNT 20
-
 namespace ble {
 
 // fwd declaration of PalAttClient and BLE
@@ -346,12 +340,12 @@ class GattServer :
 
     PalSigningMonitorEventHandler *_signing_event_handler;
 
-    attsCccSet_t cccds[MAX_CCCD_CNT];
-    uint16_t cccd_values[MAX_CCCD_CNT];
-    uint16_t cccd_handles[MAX_CCCD_CNT];
+    attsCccSet_t cccds[MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CCCD_COUNT];
+    uint16_t cccd_values[MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CCCD_COUNT];
+    uint16_t cccd_handles[MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CCCD_COUNT];
     uint8_t cccd_cnt;
 
-    GattCharacteristic *_auth_char[MAX_CHARACTERISTIC_AUTHORIZATION_CNT];
+    GattCharacteristic *_auth_char[MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CHARACTERISTIC_AUTHORISATION_COUNT];
     uint8_t _auth_char_count;
 
     struct {

connectivity/FEATURE_BLE/libraries/ble-api-implementation/mbed_lib.json

@@ -1,3 +1,13 @@
 {
-    "name": "ble-api-implementation"
+    "name": "ble-api-implementation",
+    "config": {
+        "max-characteristic-authorisation-count": {
+            "help": "Maximum count of characteristics that can be stored for authorisation purposes.",
+            "value": 20
+        },
+        "max-cccd-count": {
+            "help": "Client characteristic configuration descriptors settings.",
+            "value": 20
+        }
+    }
 }

connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GattServerImpl.cpp

@@ -406,7 +406,7 @@ ble_error_t GattServer::insert_characteristic_value_attribute(
         characteristic->isReadAuthorizationEnabled() ||
         characteristic->isWriteAuthorizationEnabled()
     ) {
-        if ( _auth_char_count >= MAX_CHARACTERISTIC_AUTHORIZATION_CNT) {
+        if ( _auth_char_count >= MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CHARACTERISTIC_AUTHORISATION_COUNT) {
             return BLE_ERROR_NO_MEM;
         }
         _auth_char[_auth_char_count] = characteristic;
@@ -446,7 +446,7 @@ ble_error_t GattServer::insert_descriptor(
 
     // handle the special case of a CCCD
     if (descriptor->getUUID() == UUID(BLE_UUID_DESCRIPTOR_CLIENT_CHAR_CONFIG)) {
-        if (cccd_cnt >= MAX_CCCD_CNT) {
+        if (cccd_cnt >= MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CCCD_COUNT) {
             return BLE_ERROR_NO_MEM;
         }
 
@@ -552,7 +552,7 @@ ble_error_t GattServer::insert_cccd(
     GattCharacteristic *characteristic,
     attsAttr_t *&attribute_it
 ) {
-    if (cccd_cnt >= MAX_CCCD_CNT) {
+    if (cccd_cnt >= MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CCCD_COUNT) {
         return BLE_ERROR_NO_MEM;
     }