From 286943d0bffa956442a1df56e133a37ee15796d7 Mon Sep 17 00:00:00 2001 From: Ayush Garg Date: Tue, 13 Sep 2022 14:49:48 +0530 Subject: [PATCH] fhub: apply DA feature (default a2dp mode, adv data flag) Change-Id: I9251ad5ddac62efeb6c743ed086c13f526594c21 Signed-off-by: Ayush Garg --- profiles/audio/media.c | 2 +- src/adapter.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 103dda8d..91d73a0b 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -1171,7 +1171,7 @@ static DBusMessage *a2dp_select_role(DBusConnection *conn, DBusMessage *msg, source_endpoint->sep = NULL; } else if (!g_strcmp0(a2dp_role, A2DP_SOURCE_ROLE)) { if (btd_adapter_get_a2dp_role(adapter->btd_adapter) == BLUETOOTH_A2DP_SOURCE_ROLE) { - DBG("Already selected A2DP sink role"); + DBG("Already selected A2DP source role"); return btd_error_already_exists(msg); } diff --git a/src/adapter.c b/src/adapter.c index 6d5cc230..d1f77518 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1139,7 +1139,11 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode, adapter->pending_settings |= setting; +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY + DBG("sending 0x%4.4x set mode %d command for index %u", opcode, mode, adapter->dev_id); +#else DBG("sending set mode command for index %u", adapter->dev_id); +#endif if (mgmt_send(adapter->mgmt, opcode, adapter->dev_id, sizeof(cp), &cp, @@ -4291,8 +4295,15 @@ static int set_adv_data_flag(uint8_t *adv_data, uint8_t *data, int data_len, voi if (adapter->le_static_addr.b[5] != 0) adv_data[2] = EIR_GEN_DISC | EIR_CONTROLLER | EIR_SIM_HOST | EIR_BREDR_UNSUP; - else - adv_data[2] = EIR_GEN_DISC | EIR_CONTROLLER | EIR_SIM_HOST; + else { +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY + if (TIZEN_FEATURE_BLUEZ_FHUB) { + DBG("Disable LE General Discoverable Mode"); + adv_data[2] = EIR_CONTROLLER | EIR_SIM_HOST; + } else +#endif + adv_data[2] = EIR_GEN_DISC | EIR_CONTROLLER | EIR_SIM_HOST; + } memcpy(adv_data + 3, data, data_len); return data_len + 3; @@ -11631,7 +11642,13 @@ static void load_config(struct btd_adapter *adapter) adapter->stored_discoverable = g_key_file_get_boolean(key_file, "General", "Discoverable", &gerr); if (gerr) { - adapter->stored_discoverable = false; +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY + if (TIZEN_FEATURE_BLUEZ_FHUB) { + DBG("Default Discoverable mode is TRUE"); + adapter->stored_discoverable = true; + } else +#endif + adapter->stored_discoverable = false; g_error_free(gerr); gerr = NULL; } -- 2.34.1