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 are populated when extended
advertising is available only.
Reviewed-by: Miao-chen Chou <mcchou@xxxxxxxxxxxx>
---
lib/mgmt.h | 2 ++
src/advertising.c | 56 +++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/lib/mgmt.h b/lib/mgmt.h
index a800bcab4..38182e576 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -516,6 +516,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_OP_REMOVE_ADVERTISING 0x003F
struct mgmt_cp_remove_advertising {
diff --git a/src/advertising.c b/src/advertising.c
index e5f25948d..9853baa4e 100644
--- a/src/advertising.c
+++ b/src/advertising.c
@@ -1321,7 +1321,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;
@@ -1345,12 +1346,63 @@ 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 gboolean display_features(const GDBusPropertyTable *property,
+ void *data)
+{
+ struct btd_adv_manager *manager = data;
+
+ /* Currently, all displayed features are supported if hardware
+ * offloading is available, so this is used to determine if we
+ * should display the feature list
+ */
+ return manager->supported_flags & (MGMT_ADV_FLAG_HW_OFFLOAD);
+}
+
+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 const GDBusPropertyTable properties[] = {
{ "ActiveInstances", "y", get_active_instances, NULL, NULL },
{ "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,
+ display_features },
{ }
};
--
2.28.0.297.g1956fa8f8d-goog
