feat(nimble): backport fixes for BLE 5.4 PTS Related Features and Fixes

components/bt/host/nimble/port/include/esp_nimble_cfg.h

@@ -964,7 +964,7 @@
 #endif
 
 #ifndef MYNEWT_VAL_BLE_STORE_MAX_CSFCS
-#define MYNEWT_VAL_BLE_STORE_MAX_CSFCS (CONFIG_BT_NIMBLE_MAX_CONNECTIONS)
+#define MYNEWT_VAL_BLE_STORE_MAX_CSFCS CONFIG_BT_NIMBLE_MAX_BONDS
 #endif
 
 #ifdef CONFIG_BT_NIMBLE_MAX_EADS

examples/bluetooth/nimble/ble_dynamic_service/main/gatt_svr.c

@@ -60,6 +60,7 @@ const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                       0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }

examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/gatt_svr.c

@@ -70,6 +70,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                         0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }

examples/bluetooth/nimble/ble_multi_adv/main/gatt_svr.c

@@ -55,6 +55,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                         0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }

examples/bluetooth/nimble/bleprph/main/gatt_svr.c

@@ -83,6 +83,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                       0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }

examples/bluetooth/nimble/power_save/main/gatt_svr.c

@@ -70,6 +70,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                       0, /* No more descriptors in this characteristic */
                     }
                 },
+                .cpfd = NULL,
             }, {
                 0, /* No more characteristics in this service. */
             }