Merge branch 'bugfix/fix_compilation_issues_v5.4' into 'release/v5.4'

fix(nimble): Address compilation issues in nimble examples (v5.4)

See merge request espressif/esp-idf!42866

Author: rahult-github

components/bt/host/nimble/Kconfig.in

@@ -581,7 +581,7 @@ menu "BLE 5.x Features"
 
         config BT_NIMBLE_EXT_SCAN
             bool "Enable extended scanning"
-            depends on BT_NIMBLE_50_FEATURE_SUPPORT && BT_NIMBLE_ROLE_OBSERVER
+            depends on BT_NIMBLE_50_FEATURE_SUPPORT
             default y
             help
                 Enable this option to do extended scanning.

components/bt/host/nimble/nimble

@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "esp_log.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BLE_SVC_GAP_TAG "ble_svc_gap"
+
+/**
+ * Stub implementations for GAP service APIs.
+ * These are compiled when CONFIG_BT_NIMBLE_GAP_SERVICE is disabled.
+ */
+
+static inline void ble_svc_gap_init(void)
+{
+    ESP_LOGE(BLE_SVC_GAP_TAG, "GAP service not enabled. Enable CONFIG_BT_NIMBLE_GAP_SERVICE to use this API.");
+}
+
+static inline int ble_svc_gap_device_name_set(const char *name)
+{
+    (void)name;
+    ESP_LOGE(BLE_SVC_GAP_TAG, "GAP service not enabled. Enable CONFIG_BT_NIMBLE_GAP_SERVICE to use this API.");
+    return -1;
+}
+
+static inline const char *ble_svc_gap_device_name(void)
+{
+    ESP_LOGE(BLE_SVC_GAP_TAG, "GAP service not enabled. Enable CONFIG_BT_NIMBLE_GAP_SERVICE to use this API.");
+    return NULL;
+}
+
+static inline int ble_svc_gap_device_appearance_set(uint16_t appearance)
+{
+    ESP_LOGE(BLE_SVC_GAP_TAG, "GAP service not enabled. Enable CONFIG_BT_NIMBLE_GAP_SERVICE to use this API.");
+    return -1;
+}
+
+static inline int ble_svc_gap_device_key_material_set(uint8_t *session_key, uint8_t *iv)
+{
+    ESP_LOGE(BLE_SVC_GAP_TAG, "GAP service not enabled. Enable CONFIG_BT_NIMBLE_GAP_SERVICE to use this API.");
+    return -1;
+}
+
+#ifdef __cplusplus
+}
+#endif

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

@@ -1804,9 +1804,11 @@
 #endif
 
 /*** @apache-mynewt-nimble/nimble/host/services/gap */
+#ifdef CONFIG_BT_NIMBLE_GAP_SERVICE
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE
 #endif
+#endif
 
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE_WRITE_PERM
 #if CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM
@@ -1819,20 +1821,24 @@
 #endif //CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM
 #endif //MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE_WRITE_PERM
 
+#ifdef CONFIG_BT_NIMBLE_GAP_SERVICE
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_CENTRAL_ADDRESS_RESOLUTION
 #define MYNEWT_VAL_BLE_SVC_GAP_CENTRAL_ADDRESS_RESOLUTION \
         CONFIG_BT_NIMBLE_SVC_GAP_CENT_ADDR_RESOLUTION
 #endif
+#endif
 
 #ifndef CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME
 #define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME "nimble"
 #else
 #define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME
 #endif
 
+#ifdef CONFIG_BT_NIMBLE_GAP_SERVICE
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH
 #define MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN // According to the specification, the maximum length should be 248
 #endif
+#endif
 
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_DEVICE_NAME_WRITE_PERM
 #if CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM

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

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -547,6 +547,7 @@ static int simple_ble_start(const simple_ble_cfg_t *cfg)
     ble_hs_cfg.sm_our_key_dist = BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID;
     ble_hs_cfg.sm_their_key_dist = BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID;
 
+#if MYNEWT_VAL(BLE_GATTS)
     rc = gatt_svr_init(cfg);
     if (rc != 0) {
         ESP_LOGE(TAG, "Error initializing GATT server");
@@ -565,6 +566,7 @@ static int simple_ble_start(const simple_ble_cfg_t *cfg)
         resp_data.name_len = strlen(ble_svc_gap_device_name());
         resp_data.name_is_complete = 1;
     }
+#endif
 
     /* Set manufacturer data if protocomm_ble_mfg_data points to valid data */
     if (protocomm_ble_mfg_data != NULL) {

components/protocomm/src/transports/protocomm_nimble.c

@@ -78,12 +78,14 @@ void app_main(void) {
         return;
     }
 
+#if CONFIG_BT_NIMBLE_GAP_SERVICE
     /* GAP service initialization */
     rc = gap_init();
     if (rc != 0) {
         ESP_LOGE(TAG, "failed to initialize GAP service, error code: %d", rc);
         return;
     }
+#endif
 
     /* NimBLE host configuration initialization */
     nimble_host_config_init();

examples/bluetooth/ble_get_started/nimble/NimBLE_Beacon/main/main.c

@@ -82,12 +82,14 @@ void app_main(void) {
         return;
     }
 
+#if CONFIG_BT_NIMBLE_GAP_SERVICE
     /* GAP service initialization */
     rc = gap_init();
     if (rc != 0) {
         ESP_LOGE(TAG, "failed to initialize GAP service, error code: %d", rc);
         return;
     }
+#endif
 
     /* NimBLE host configuration initialization */
     nimble_host_config_init();

examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/main/main.c

@@ -251,6 +251,7 @@ int gap_init(void) {
     /* Local variables */
     int rc = 0;
 
+
     /* Initialize GAP service */
     ble_svc_gap_init();
 

examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/main/src/gap.c

@@ -109,12 +109,14 @@ void app_main(void) {
         return;
     }
 
+#if CONFIG_BT_NIMBLE_GAP_SERVICE
     /* GAP service initialization */
     rc = gap_init();
     if (rc != 0) {
         ESP_LOGE(TAG, "failed to initialize GAP service, error code: %d", rc);
         return;
     }
+#endif
 
     /* GATT server initialization */
     rc = gatt_svc_init();

examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/main.c

@@ -118,12 +118,14 @@ void app_main(void) {
         return;
     }
 
+#if CONFIG_BT_NIMBLE_GAP_SERVICE
     /* GAP service initialization */
     rc = gap_init();
     if (rc != 0) {
         ESP_LOGE(TAG, "failed to initialize GAP service, error code: %d", rc);
         return;
     }
+#endif
 
     /* GATT server initialization */
     rc = gatt_svc_init();