From 3c878e0321dd3b3fc4fc39cb3ab03a3f06bf31a6 Mon Sep 17 00:00:00 2001
From: Rahul Tank <rahul.tank@espressif.com>
Date: Tue, 26 May 2026 22:00:39 +0530
Subject: [PATCH] fix(nimble): Fix compilation issues in Gatt SPS service

---
 components/bt/host/nimble/Kconfig.in                      | 8 ++++++++
 components/bt/host/nimble/nimble                          | 2 +-
 .../nimble/ble_chan_sound_initiator/main/gatt_svr.c       | 3 ++-
 .../nimble/ble_chan_sound_reflector/main/gatt_svr.c       | 3 ++-
 .../bluetooth/nimble/ble_htp/htp_prph/main/gatt_svr.c     | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
index 1675dc78033..2c96fc3b8fd 100644
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -833,6 +833,14 @@ menu "Services"
         help
             Defines maximum number of report characteristics per service instance
 
+    config BT_NIMBLE_RAS_SERVICE
+        depends on BT_NIMBLE_CHANNEL_SOUNDING
+        bool "RAS service"
+        default y
+        help
+            Enable RAS Service
+
+
     menuconfig BT_NIMBLE_BAS_SERVICE
         bool "Battery service"
         default y
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
index df2e4440e0a..17a032f0c73 160000
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
@@ -1 +1 @@
-Subproject commit df2e4440e0add798a2893f67d548d0e80204d6d0
+Subproject commit 17a032f0c73bc3bd376ebe172f84e6439dc2b599
diff --git a/examples/bluetooth/nimble/ble_chan_sound_initiator/main/gatt_svr.c b/examples/bluetooth/nimble/ble_chan_sound_initiator/main/gatt_svr.c
index 168d0035c79..2f06346da8c 100644
--- a/examples/bluetooth/nimble/ble_chan_sound_initiator/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/ble_chan_sound_initiator/main/gatt_svr.c
@@ -31,7 +31,8 @@ gatt_svr_init(void)
 #if MYNEWT_VAL(BLE_GATTS)
     ble_svc_gatt_init();
 #endif
+#if MYNEWT_VAL(BLE_GATTS) && CONFIG_BT_NIMBLE_RAS_SERVICE
     ble_svc_ras_init();
-
+#endif
     return 0;
 }
diff --git a/examples/bluetooth/nimble/ble_chan_sound_reflector/main/gatt_svr.c b/examples/bluetooth/nimble/ble_chan_sound_reflector/main/gatt_svr.c
index fdadd4c2aa7..f559b1d6f34 100644
--- a/examples/bluetooth/nimble/ble_chan_sound_reflector/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/ble_chan_sound_reflector/main/gatt_svr.c
@@ -31,7 +31,8 @@ custom_gatt_svr_init(void)
 #if MYNEWT_VAL(BLE_GATTS)
     ble_svc_gatt_init();
 #endif
+#if MYNEWT_VAL(BLE_GATTS) && CONFIG_BT_NIMBLE_RAS_SERVICE
     ble_svc_ras_init();
-
+#endif
     return 0;
 }
diff --git a/examples/bluetooth/nimble/ble_htp/htp_prph/main/gatt_svr.c b/examples/bluetooth/nimble/ble_htp/htp_prph/main/gatt_svr.c
index 82b6b1f1bcf..aae6bd14d51 100644
--- a/examples/bluetooth/nimble/ble_htp/htp_prph/main/gatt_svr.c
+++ b/examples/bluetooth/nimble/ble_htp/htp_prph/main/gatt_svr.c
@@ -123,7 +123,7 @@ gatt_svr_init(void)
 #if MYNEWT_VAL(BLE_GATTS)
     ble_svc_gatt_init();
 #endif
-#if CONFIG_BT_NIMBLE_ANS_SERVICE
+#if CONFIG_BT_NIMBLE_HTP_SERVICE
     ble_svc_htp_init();
 #endif