Merge branch 'bugfix/add_dis_ieee_udi_to_config_v6.0' into 'release/v6.0'

fix(nimble): Add option to disable IEEE and UDI Characteristic in DIS (v6.0)

See merge request espressif/esp-idf!50760

components/bt/host/nimble/Kconfig.in

@@ -1002,6 +1002,20 @@ menu "Services"
         help
             Enable the DIS PnP ID characteristic
 
+    config BT_NIMBLE_SVC_DIS_IEEE
+        depends on BT_NIMBLE_DIS_SERVICE
+        bool "IEEE"
+        default y
+        help
+            Enable the DIS IEEE characteristic
+
+    config BT_NIMBLE_SVC_DIS_UDI
+        depends on BT_NIMBLE_DIS_SERVICE
+        bool "UDI"
+        default y
+        help
+            Enable the DIS UDI characteristic
+
     config BT_NIMBLE_SVC_DIS_INCLUDED
         depends on BT_NIMBLE_DIS_SERVICE
         bool "DIS as an Included Service"

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

@@ -1842,6 +1842,18 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_PNP_ID_READ_PERM (-1)
 #endif
 
+#if CONFIG_BT_NIMBLE_SVC_DIS_IEEE
+#define MYNEWT_VAL_BLE_SVC_DIS_IEEE_READ_PERM (0)
+#else
+#define MYNEWT_VAL_BLE_SVC_DIS_IEEE_READ_PERM (-1)
+#endif
+
+#if CONFIG_BT_NIMBLE_SVC_DIS_UDI
+#define MYNEWT_VAL_BLE_SVC_DIS_UDI_READ_PERM (0)
+#else
+#define MYNEWT_VAL_BLE_SVC_DIS_UDI_READ_PERM (-1)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_INCLUDED
 #define MYNEWT_VAL_BLE_SVC_DIS_INCLUDED (CONFIG_BT_NIMBLE_SVC_DIS_INCLUDED)
 #endif