diff --git a/components/bt/host/bluedroid/Kconfig.in b/components/bt/host/bluedroid/Kconfig.in index 62519ec47a..d0e33b1eaf 100644 --- a/components/bt/host/bluedroid/Kconfig.in +++ b/components/bt/host/bluedroid/Kconfig.in @@ -133,25 +133,25 @@ config BT_SDP_COMMON_ENABLED This enables common SDP operation, such as SDP record creation and deletion. config BT_SDP_PAD_LEN - int "BT SDP attributes allocated length (bytes)" + int "One or more BT SDP attributes total allocated length (bytes)" + depends on BT_CLASSIC_ENABLED + default 300 + range BT_SDP_ATTR_LEN 1024 + help + This is the total size of all SDP attributes allowed. + Any attributes that exceed this size are truncated. + The default value is 300. + +config BT_SDP_ATTR_LEN + int "Single BT SDP attribute allocated length (bytes)" depends on BT_CLASSIC_ENABLED default 300 range 300 1024 help - This is the total size of all SDP attributes allowed. - Any attributes that exceed this size are truncated. + This is the maximum allowed size for a single SDP attribute. + Any attributes that exceed this size are truncated. The default value is 300. -config BT_SDP_ATTR_LEN - int "BT SDP attribute allocated length (bytes)" - depends on BT_CLASSIC_ENABLED - default 400 - range 400 1024 - help - This is the maximum allowed size for a single SDP attribute. - Any attributes that exceed this size are truncated. - The default value is 400. - menuconfig BT_HFP_ENABLE bool "Hands Free/Handset Profile" depends on BT_CLASSIC_ENABLED diff --git a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h index 107424b2c7..fd758e02ec 100644 --- a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h +++ b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h @@ -76,15 +76,15 @@ // SDP Pad Length #ifdef CONFIG_BT_SDP_PAD_LEN #define UC_SDP_MAX_PAD_LEN CONFIG_BT_SDP_PAD_LEN -#else +#else #define UC_SDP_MAX_PAD_LEN 300 #endif // SDP Max Attribute Length #ifdef CONFIG_BT_SDP_ATTR_LEN #define UC_SDP_MAX_ATTR_LEN CONFIG_BT_SDP_ATTR_LEN -#else -#define UC_SDP_MAX_ATTR_LEN 400 +#else +#define UC_SDP_MAX_ATTR_LEN 300 #endif //HFP(AG) diff --git a/components/bt/host/bluedroid/common/include/common/bt_target.h b/components/bt/host/bluedroid/common/include/common/bt_target.h index 631ef01e32..2b269d068a 100644 --- a/components/bt/host/bluedroid/common/include/common/bt_target.h +++ b/components/bt/host/bluedroid/common/include/common/bt_target.h @@ -1659,17 +1659,13 @@ #endif /* The maximum length, in bytes, of all SDP attributes combined. */ -#if defined(UC_SDP_MAX_PAD_LEN) +#ifndef SDP_MAX_PAD_LEN #define SDP_MAX_PAD_LEN UC_SDP_MAX_PAD_LEN -#elif !defined(SDP_MAX_PAD_LEN) -#define SDP_MAX_PAD_LEN 300 #endif /* The maximum length, in bytes, of an attribute. */ -#if defined(UC_SDP_MAX_ATTR_LEN) +#ifndef SDP_MAX_ATTR_LEN #define SDP_MAX_ATTR_LEN UC_SDP_MAX_ATTR_LEN -#elif !defined(SDP_MAX_ATTR_LEN) -#define SDP_MAX_ATTR_LEN 400 #endif /* The maximum number of attribute filters supported by SDP databases. */