| Message ID | 20210305155113.Bluez.v3.1.Idf2f9f409a4df20b466ba723dd9b729275a5afbf@changeid |
|---|---|
| State | New |
| Headers | show |
| Series | Expose extended adv feature support via bluez API | expand |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=443035 ---Test result--- ############################## Test: CheckPatch - PASS ############################## Test: CheckGitLint - PASS ############################## Test: CheckBuild - PASS ############################## Test: MakeCheck - PASS --- Regards, Linux Bluetooth
Hi Daniel, On Fri, Mar 5, 2021 at 3:59 PM Daniel Winkler <danielwinkler@google.com> wrote: > > The new SupportedFeatures member tells advertising clients whether the > platform has hardware support for advertising or capability to set tx > power of advertisements. > > Additionally, fix small typo in "secondary_exists" function name. > > Change is tested on hatch and kukui chromebooks by using dbus-send to > verify that SupportedFeatures always exists, and is only populated when > extended advertising is available. > > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > --- > > Changes in v3: None > Changes in v2: > - Expose empty SupportedFeatures if no support available > > lib/mgmt.h | 2 ++ > src/advertising.c | 43 +++++++++++++++++++++++++++++++++++++++++-- > 2 files changed, 43 insertions(+), 2 deletions(-) > > diff --git a/lib/mgmt.h b/lib/mgmt.h > index 76a03c9c2..c0021abd8 100644 > --- a/lib/mgmt.h > +++ b/lib/mgmt.h > @@ -503,6 +503,8 @@ struct mgmt_rp_add_advertising { > #define MGMT_ADV_FLAG_SEC_1M (1 << 7) > #define MGMT_ADV_FLAG_SEC_2M (1 << 8) > #define MGMT_ADV_FLAG_SEC_CODED (1 << 9) > +#define MGMT_ADV_FLAG_CAN_SET_TX_POWER (1 << 10) > +#define MGMT_ADV_FLAG_HW_OFFLOAD (1 << 11) > #define MGMT_ADV_PARAM_DURATION (1 << 12) > #define MGMT_ADV_PARAM_TIMEOUT (1 << 13) > #define MGMT_ADV_PARAM_INTERVALS (1 << 14) > diff --git a/src/advertising.c b/src/advertising.c > index 15a343e52..dd6008cb9 100644 > --- a/src/advertising.c > +++ b/src/advertising.c > @@ -1616,7 +1616,8 @@ static void append_secondary(struct btd_adv_manager *manager, > } > } > > -static gboolean secondary_exits(const GDBusPropertyTable *property, void *data) > +static gboolean secondary_exists(const GDBusPropertyTable *property, > + void *data) > { > struct btd_adv_manager *manager = data; > > @@ -1640,6 +1641,43 @@ static gboolean get_supported_secondary(const GDBusPropertyTable *property, > return TRUE; > } > > +static struct adv_feature { > + int flag; > + const char *name; > +} features[] = { > + { MGMT_ADV_FLAG_CAN_SET_TX_POWER, "CanSetTxPower" }, > + { MGMT_ADV_FLAG_HW_OFFLOAD, "HardwareOffload" }, > + { }, > +}; > + > +static void append_features(struct btd_adv_manager *manager, > + DBusMessageIter *iter) > +{ > + struct adv_feature *feat; > + > + for (feat = features; feat->name; feat++) { > + if (manager->supported_flags & feat->flag) > + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, > + &feat->name); > + } > +} > + > +static gboolean get_supported_features(const GDBusPropertyTable *property, > + DBusMessageIter *iter, void *data) > +{ > + struct btd_adv_manager *manager = data; > + DBusMessageIter entry; > + > + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, > + DBUS_TYPE_STRING_AS_STRING, &entry); > + > + append_features(manager, &entry); > + > + dbus_message_iter_close_container(iter, &entry); > + > + return TRUE; > +} > + > static gboolean get_supported_cap(const GDBusPropertyTable *property, > DBusMessageIter *iter, void *data) > { > @@ -1678,7 +1716,8 @@ static const GDBusPropertyTable properties[] = { > { "SupportedInstances", "y", get_instances, NULL, NULL }, > { "SupportedIncludes", "as", get_supported_includes, NULL, NULL }, > { "SupportedSecondaryChannels", "as", get_supported_secondary, NULL, > - secondary_exits }, > + secondary_exists }, > + { "SupportedFeatures", "as", get_supported_features, NULL, NULL }, Missing G_DBUS_PROPERTY_FLAG_EXPERIMENTAL. > { "SupportedCapabilities", "a{sv}", get_supported_cap, NULL, NULL, > G_DBUS_PROPERTY_FLAG_EXPERIMENTAL}, > { } > -- > 2.30.1.766.gb4fecdf3b7-goog > -- Luiz Augusto von Dentz
diff --git a/lib/mgmt.h b/lib/mgmt.h index 76a03c9c2..c0021abd8 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -503,6 +503,8 @@ struct mgmt_rp_add_advertising { #define MGMT_ADV_FLAG_SEC_1M (1 << 7) #define MGMT_ADV_FLAG_SEC_2M (1 << 8) #define MGMT_ADV_FLAG_SEC_CODED (1 << 9) +#define MGMT_ADV_FLAG_CAN_SET_TX_POWER (1 << 10) +#define MGMT_ADV_FLAG_HW_OFFLOAD (1 << 11) #define MGMT_ADV_PARAM_DURATION (1 << 12) #define MGMT_ADV_PARAM_TIMEOUT (1 << 13) #define MGMT_ADV_PARAM_INTERVALS (1 << 14) diff --git a/src/advertising.c b/src/advertising.c index 15a343e52..dd6008cb9 100644 --- a/src/advertising.c +++ b/src/advertising.c @@ -1616,7 +1616,8 @@ static void append_secondary(struct btd_adv_manager *manager, } } -static gboolean secondary_exits(const GDBusPropertyTable *property, void *data) +static gboolean secondary_exists(const GDBusPropertyTable *property, + void *data) { struct btd_adv_manager *manager = data; @@ -1640,6 +1641,43 @@ static gboolean get_supported_secondary(const GDBusPropertyTable *property, return TRUE; } +static struct adv_feature { + int flag; + const char *name; +} features[] = { + { MGMT_ADV_FLAG_CAN_SET_TX_POWER, "CanSetTxPower" }, + { MGMT_ADV_FLAG_HW_OFFLOAD, "HardwareOffload" }, + { }, +}; + +static void append_features(struct btd_adv_manager *manager, + DBusMessageIter *iter) +{ + struct adv_feature *feat; + + for (feat = features; feat->name; feat++) { + if (manager->supported_flags & feat->flag) + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, + &feat->name); + } +} + +static gboolean get_supported_features(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct btd_adv_manager *manager = data; + DBusMessageIter entry; + + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, + DBUS_TYPE_STRING_AS_STRING, &entry); + + append_features(manager, &entry); + + dbus_message_iter_close_container(iter, &entry); + + return TRUE; +} + static gboolean get_supported_cap(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { @@ -1678,7 +1716,8 @@ static const GDBusPropertyTable properties[] = { { "SupportedInstances", "y", get_instances, NULL, NULL }, { "SupportedIncludes", "as", get_supported_includes, NULL, NULL }, { "SupportedSecondaryChannels", "as", get_supported_secondary, NULL, - secondary_exits }, + secondary_exists }, + { "SupportedFeatures", "as", get_supported_features, NULL, NULL }, { "SupportedCapabilities", "a{sv}", get_supported_cap, NULL, NULL, G_DBUS_PROPERTY_FLAG_EXPERIMENTAL}, { }
The new SupportedFeatures member tells advertising clients whether the platform has hardware support for advertising or capability to set tx power of advertisements. Additionally, fix small typo in "secondary_exists" function name. Change is tested on hatch and kukui chromebooks by using dbus-send to verify that SupportedFeatures always exists, and is only populated when extended advertising is available. Reviewed-by: Miao-chen Chou <mcchou@chromium.org> --- Changes in v3: None Changes in v2: - Expose empty SupportedFeatures if no support available lib/mgmt.h | 2 ++ src/advertising.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-)