diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch index 0cd2325ae..f195bce44 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0001-Fix-advertise-time-out-when-default-is-set-to-zero.patch @@ -1,4 +1,4 @@ -From 7f7b3ad0297475f478999bb53c6322017089140b Mon Sep 17 00:00:00 2001 +From 3edb60015a4e93e25ac223c657f9477b9f48ece0 Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Wed, 11 Apr 2018 11:03:20 +0530 Subject: [PATCH] Fix advertise time out when default is set to zero @@ -26,7 +26,7 @@ Upstream-Status: Pending 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/advertising.c b/src/advertising.c -index 1fe371a9f..d857fd96e 100644 +index f9748b132..694447057 100644 --- a/src/advertising.c +++ b/src/advertising.c @@ -525,13 +525,18 @@ static bool parse_local_name(DBusMessageIter *iter, diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch index 2aa8f8739..8ab512565 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0002-Send-disconnect-signal-on-remote-device-disconnect.patch @@ -1,4 +1,4 @@ -From 9b31ce821930ae56ea9dc6138f0b4e76d0536f18 Mon Sep 17 00:00:00 2001 +From 67c89b925334a3f41f4b85ce9e1a1dd5d5e2822f Mon Sep 17 00:00:00 2001 From: Vibhanshu Dhote Date: Thu, 17 May 2018 18:15:48 +0530 Subject: [PATCH] Send disconnect signal on remote device disconnect diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch index 977f847d1..b09f459a6 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch @@ -1,4 +1,4 @@ -From 7084f0e9638e0c90f50c0cabe6d15ea92cd60298 Mon Sep 17 00:00:00 2001 +From a2064617fa5db4c5ad4120133406f8e3de1fdb9c Mon Sep 17 00:00:00 2001 From: "vijaya.sundaram" Date: Fri, 1 Jun 2018 11:43:15 +0530 Subject: [PATCH] Fetching device type like BLE, BREDR from bluez @@ -25,7 +25,7 @@ Upstream-Status: Pending 1 file changed, 17 insertions(+) diff --git a/src/device.c b/src/device.c -index 9a4f2ce45..c21fcaa76 100644 +index 995d39f2c..b1fe7fd7c 100644 --- a/src/device.c +++ b/src/device.c @@ -206,6 +206,7 @@ struct btd_device { diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch index 2a01a04cc..7aa1c9be7 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch @@ -1,4 +1,4 @@ -From 1c436e8b0c6acc38830f93d7f94686bdd3117cc5 Mon Sep 17 00:00:00 2001 +From 9acc3246d1c47383edf4dfee3054734f9adf09ae Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Sun, 22 Jul 2018 18:59:45 +0530 Subject: [PATCH] Fix Gatt connect when device address type is BDADDR_LE_PUBLIC @@ -30,7 +30,7 @@ Upstream-Status: Pending 1 file changed, 28 insertions(+) diff --git a/src/device.c b/src/device.c -index c21fcaa76..a3c51c0f5 100644 +index b1fe7fd7c..bda45dfdf 100644 --- a/src/device.c +++ b/src/device.c @@ -2366,6 +2366,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg, diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch index af99a39d4..568ebe695 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch @@ -1,4 +1,4 @@ -From 46c4e89c27b9a6b434d74ce1e53aa5ad312edf16 Mon Sep 17 00:00:00 2001 +From ff6dc50e04ada7f717139cf7b1adb29863e0efb8 Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Thu, 15 Nov 2018 11:08:44 +0530 Subject: [PATCH] Use system bus instead of session for obexd diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch index 9c017b3f9..d06db5c4d 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch @@ -1,4 +1,4 @@ -From 163333cd51ea3dd9f5f7bd44310b7c4e385865a0 Mon Sep 17 00:00:00 2001 +From 87032726d8ab8fdbb172ce098560c1fd80a7e184 Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Tue, 22 Jan 2019 23:25:18 +0530 Subject: [PATCH] Implementation to get connected profiles uuids @@ -25,7 +25,7 @@ Upstream-Status: Inappropriate [webos specific] 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/src/device.c b/src/device.c -index a3c51c0f5..fea01d20a 100644 +index bda45dfdf..750232410 100644 --- a/src/device.c +++ b/src/device.c @@ -215,6 +215,7 @@ struct btd_device { diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch index 048d00c57..640167221 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch @@ -1,4 +1,4 @@ -From 76f3a04a8135315944af66b322bb646d66b6366c Mon Sep 17 00:00:00 2001 +From 30b1947069401365ed1fe5ff5531e7cca6f15d3b Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Sun, 13 Jan 2019 13:35:55 +0530 Subject: [PATCH] recievePassThrough commad support required for webos @@ -56,7 +56,7 @@ index 6f64f162b..b002470f9 100644 break; } diff --git a/src/device.c b/src/device.c -index fea01d20a..2eef2a8cf 100644 +index 750232410..07dad435b 100644 --- a/src/device.c +++ b/src/device.c @@ -170,6 +170,11 @@ enum { @@ -168,7 +168,7 @@ index fea01d20a..2eef2a8cf 100644 { "ServiceData", "a{sv}", dev_property_get_service_data, NULL, dev_property_service_data_exist }, { "TxPower", "n", dev_property_get_tx_power, NULL, -@@ -4037,6 +4089,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter, +@@ -4040,6 +4092,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter, device->adapter = adapter; device->temporary = true; @@ -179,10 +179,10 @@ index fea01d20a..2eef2a8cf 100644 gatt_service_removed, device, NULL); diff --git a/src/device.h b/src/device.h -index d7f886224..b7a5aaa98 100644 +index 9e81fda9e..6297e04c0 100644 --- a/src/device.h +++ b/src/device.h -@@ -186,3 +186,5 @@ void btd_device_cleanup(void); +@@ -188,3 +188,5 @@ void btd_device_cleanup(void); void btd_device_set_volume(struct btd_device *dev, int8_t volume); int8_t btd_device_get_volume(struct btd_device *dev); diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch index 68329ce9d..922b5ecc9 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch @@ -1,4 +1,4 @@ -From 49fb6333df5255cf3b4aba4d26c1b141b08945d7 Mon Sep 17 00:00:00 2001 +From a329e8a0fb56137887aa80717c288559093da568 Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Wed, 30 Jan 2019 15:17:11 +0530 Subject: [PATCH] Added dbus signal for MediaPlayRequest @@ -49,10 +49,10 @@ index 80f34c7a7..1b3e6090a 100644 } diff --git a/profiles/audio/media.c b/profiles/audio/media.c -index c5d8ab14e..97c453021 100644 +index c9328ab9b..bea2e6358 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c -@@ -1229,7 +1229,7 @@ static uint32_t media_player_get_position(void *user_data) +@@ -1761,7 +1761,7 @@ static uint32_t media_player_get_position(void *user_data) sec = (uint32_t) timedelta; msec = (uint32_t) ((timedelta - sec) * 1000); @@ -62,7 +62,7 @@ index c5d8ab14e..97c453021 100644 static uint32_t media_player_get_duration(void *user_data) diff --git a/src/device.c b/src/device.c -index 2eef2a8cf..275f4a9a6 100644 +index 07dad435b..3f9f1190d 100644 --- a/src/device.c +++ b/src/device.c @@ -2087,6 +2087,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons @@ -101,7 +101,7 @@ index 2eef2a8cf..275f4a9a6 100644 static const GDBusMethodTable device_methods[] = { { GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) }, { GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) }, -@@ -4078,7 +4100,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter, +@@ -4081,7 +4103,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter, if (g_dbus_register_interface(dbus_conn, device->path, DEVICE_INTERFACE, @@ -111,10 +111,10 @@ index 2eef2a8cf..275f4a9a6 100644 device_free) == FALSE) { error("Unable to register device interface for %s", address); diff --git a/src/device.h b/src/device.h -index b7a5aaa98..fe2387fb3 100644 +index 6297e04c0..549e53b81 100644 --- a/src/device.h +++ b/src/device.h -@@ -188,3 +188,6 @@ void btd_device_set_volume(struct btd_device *dev, int8_t volume); +@@ -190,3 +190,6 @@ void btd_device_set_volume(struct btd_device *dev, int8_t volume); int8_t btd_device_get_volume(struct btd_device *dev); void recieve_passThrough_commands(struct btd_device *dev, const char* code, const char* state); diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch index 96476d8fe..acf71abf1 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch @@ -1,4 +1,4 @@ -From 06d8a4416ed5d2c19e4b6d08c1bae8c6ca758d97 Mon Sep 17 00:00:00 2001 +From 4564bd613eb15b23f1c8fd9b5aca3a2aaeb179c1 Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Tue, 5 Feb 2019 18:10:55 +0530 Subject: [PATCH] avrcp getting remote device features list @@ -80,7 +80,7 @@ index 1b3e6090a..61478e913 100644 } diff --git a/src/device.c b/src/device.c -index 275f4a9a6..3cad84e37 100644 +index 3f9f1190d..efe3a636f 100644 --- a/src/device.c +++ b/src/device.c @@ -282,6 +282,8 @@ struct btd_device { @@ -176,7 +176,7 @@ index 275f4a9a6..3cad84e37 100644 { "ServiceData", "a{sv}", dev_property_get_service_data, NULL, dev_property_service_data_exist }, { "TxPower", "n", dev_property_get_tx_power, NULL, -@@ -4114,6 +4179,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter, +@@ -4117,6 +4182,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter, device->passththough_key.state = NULL; device->passththough_key.key = NULL; @@ -187,7 +187,7 @@ index 275f4a9a6..3cad84e37 100644 gatt_service_removed, device, NULL); diff --git a/src/device.h b/src/device.h -index fe2387fb3..a3ee4279c 100644 +index 549e53b81..3fcfd919d 100644 --- a/src/device.h +++ b/src/device.h @@ -10,6 +10,10 @@ @@ -201,7 +201,7 @@ index fe2387fb3..a3ee4279c 100644 struct btd_device; -@@ -191,3 +195,4 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons +@@ -193,3 +197,4 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons void media_play_request(struct btd_device *dev); void media_metadata_request(struct btd_device *dev); diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch index d95aba958..800222332 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch @@ -1,4 +1,4 @@ -From 762ead4c8d565ada8022e9d544963522fa70de8b Mon Sep 17 00:00:00 2001 +From 91af1c0af8c0b0c15c02b577290a60e15cabed1d Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Mon, 21 Jan 2019 12:44:19 +0530 Subject: [PATCH] Fix volume property not able to set @@ -26,10 +26,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c -index 5848e4019..19a39af47 100644 +index 41339da51..2827ff42d 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c -@@ -810,7 +810,7 @@ static int media_transport_init_source(struct media_transport *transport) +@@ -1065,7 +1065,7 @@ static int media_transport_init_source(struct media_transport *transport) transport->data = a2dp; transport->destroy = destroy_a2dp; diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch index 8cad8b46a..623b04004 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch @@ -1,4 +1,4 @@ -From 9048d00c3e742f7cfc43a31fb0dce2537ad02956 Mon Sep 17 00:00:00 2001 +From 66089ff883a5904898c4e7810422a5035d9f41b7 Mon Sep 17 00:00:00 2001 From: Sameer Mulla Date: Tue, 10 Dec 2019 16:15:43 +0530 Subject: [PATCH] Fix volume level notification not appearing after 127 @@ -29,10 +29,10 @@ Upstream-Status: Inappropriate [webos specific] 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/profiles/audio/media.c b/profiles/audio/media.c -index 97c453021..7f1ff346b 100644 +index bea2e6358..a9c42450c 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c -@@ -1244,8 +1244,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev, +@@ -1776,8 +1776,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev, { struct media_player *mp = user_data; @@ -44,10 +44,10 @@ index 97c453021..7f1ff346b 100644 mp->volume = volume; } diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c -index 19a39af47..769fffdd3 100644 +index 2827ff42d..f9c1a4a16 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c -@@ -656,8 +656,8 @@ static void set_volume(const GDBusPropertyTable *property, +@@ -749,8 +749,8 @@ static void set_volume(const GDBusPropertyTable *property, g_dbus_pending_property_success(id); volume = (int8_t)arg; @@ -58,7 +58,7 @@ index 19a39af47..769fffdd3 100644 notify = transport->source_watch ? true : false; if (notify) { -@@ -932,8 +932,8 @@ void media_transport_update_volume(struct media_transport *transport, +@@ -1517,8 +1517,8 @@ void media_transport_update_volume(struct media_transport *transport, return; /* Check if volume really changed */ diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch index 8f20a3db7..f02c1c8b5 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0012-Support-enabling-avdtp-delayReport.patch @@ -1,4 +1,4 @@ -From 9052c6a17f1a27a7f516850a167b51ce83806872 Mon Sep 17 00:00:00 2001 +From 7c3eb3855096453d6f59d9d3b55a22c1d3ba4c3c Mon Sep 17 00:00:00 2001 From: "sameer.mulla" Date: Thu, 4 Jun 2020 04:49:48 +0000 Subject: [PATCH] Support enabling avdtp delayReport @@ -35,7 +35,7 @@ Upstream-Status: Pending 11 files changed, 104 insertions(+) diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c -index 276512208..fb6c9f680 100644 +index 47b5dd7c3..7865bce7f 100644 --- a/profiles/audio/a2dp.c +++ b/profiles/audio/a2dp.c @@ -2390,6 +2390,14 @@ found: @@ -91,10 +91,10 @@ index 102a2603e..b167f2dab 100644 uint16_t avdtp_get_version(struct avdtp *session); +void avdtp_local_sep_set_delay_report(struct avdtp_local_sep *lsep, bool delay_reporting); diff --git a/profiles/audio/media.c b/profiles/audio/media.c -index 7f1ff346b..617763982 100644 +index a9c42450c..3f147b697 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c -@@ -120,6 +120,19 @@ struct media_player { +@@ -128,6 +128,19 @@ struct media_player { static GSList *adapters = NULL; @@ -114,7 +114,7 @@ index 7f1ff346b..617763982 100644 static void endpoint_request_free(struct endpoint_request *request) { if (request->call) -@@ -807,6 +820,9 @@ static struct media_endpoint *media_endpoint_create(struct media_adapter *adapte +@@ -1314,6 +1327,9 @@ media_endpoint_create(struct media_adapter *adapter, } endpoint->adapter = adapter; @@ -122,9 +122,9 @@ index 7f1ff346b..617763982 100644 + + DBG("delay_reporting %d", delay_reporting); - if (strcasecmp(uuid, A2DP_SOURCE_UUID) == 0) - succeeded = endpoint_init_a2dp_source(endpoint, -@@ -2427,6 +2443,7 @@ int media_register(struct btd_adapter *btd_adapter) + for (i = 0; i < ARRAY_SIZE(init_table); i++) { + init = &init_table[i]; +@@ -3050,6 +3066,7 @@ int media_register(struct btd_adapter *btd_adapter) return -1; } @@ -150,7 +150,7 @@ index 96bea9db4..e9d10fd3c 100644 int8_t media_player_get_device_volume(struct btd_device *device); +void media_set_delay_reporting(struct media_adapter* adapter, bool delay_reporting); diff --git a/src/adapter.c b/src/adapter.c -index b159d2135..9ebcf6368 100644 +index 8fb2acdc8..f22f17508 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -67,6 +67,7 @@ @@ -161,7 +161,7 @@ index b159d2135..9ebcf6368 100644 #define MODE_OFF 0x00 #define MODE_CONNECTABLE 0x01 -@@ -271,6 +272,9 @@ struct btd_adapter { +@@ -280,6 +281,9 @@ struct btd_adapter { bool filtered_discovery; /* we are doing filtered discovery */ bool no_scan_restart_delay; /* when this flag is set, restart scan * without delay */ @@ -171,7 +171,7 @@ index b159d2135..9ebcf6368 100644 uint8_t discovery_type; /* current active discovery type */ uint8_t discovery_enable; /* discovery enabled/disabled */ bool discovery_suspended; /* discovery has been suspended */ -@@ -330,6 +334,11 @@ typedef enum { +@@ -357,6 +361,11 @@ typedef enum { ADAPTER_AUTHORIZE_CHECK_CONNECTED } adapter_authorize_type; @@ -183,7 +183,7 @@ index b159d2135..9ebcf6368 100644 static struct btd_adapter *btd_adapter_lookup(uint16_t index) { GList *list; -@@ -532,6 +541,8 @@ static void store_adapter_info(struct btd_adapter *adapter) +@@ -559,6 +568,8 @@ static void store_adapter_info(struct btd_adapter *adapter) g_key_file_set_boolean(key_file, "General", "Discoverable", discoverable); @@ -192,7 +192,7 @@ index b159d2135..9ebcf6368 100644 if (adapter->discoverable_timeout != btd_opts.discovto) g_key_file_set_integer(key_file, "General", -@@ -3312,6 +3323,30 @@ static gboolean property_get_roles(const GDBusPropertyTable *property, +@@ -3476,6 +3487,30 @@ static gboolean property_get_roles(const GDBusPropertyTable *property, return TRUE; } @@ -223,15 +223,15 @@ index b159d2135..9ebcf6368 100644 static void property_append_experimental(void *data, void *user_data) { -@@ -3714,6 +3749,7 @@ static const GDBusPropertyTable adapter_properties[] = { +@@ -3880,6 +3915,7 @@ static const GDBusPropertyTable adapter_properties[] = { { "Roles", "as", property_get_roles }, { "ExperimentalFeatures", "as", property_get_experimental, NULL, - property_experimental_exits }, + property_experimental_exists }, + { "DelayReport", "b", property_get_delay_report_feature, property_set_delay_report_feature }, { } }; -@@ -5091,6 +5127,11 @@ bool btd_adapter_get_bredr(struct btd_adapter *adapter) +@@ -5257,6 +5293,11 @@ bool btd_adapter_get_bredr(struct btd_adapter *adapter) return false; } @@ -243,7 +243,7 @@ index b159d2135..9ebcf6368 100644 struct btd_gatt_database *btd_adapter_get_database(struct btd_adapter *adapter) { if (!adapter) -@@ -6617,6 +6658,15 @@ static void load_config(struct btd_adapter *adapter) +@@ -6786,6 +6827,15 @@ static void load_config(struct btd_adapter *adapter) gerr = NULL; } @@ -259,7 +259,7 @@ index b159d2135..9ebcf6368 100644 g_key_file_free(key_file); } -@@ -6649,6 +6699,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) +@@ -6822,6 +6872,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) btd_opts.did_version); adapter->discoverable_timeout = btd_opts.discovto; adapter->pairable_timeout = btd_opts.pairto; @@ -267,16 +267,16 @@ index b159d2135..9ebcf6368 100644 DBG("System name: %s", adapter->system_name); DBG("Major class: %u", adapter->major_class); -@@ -6656,6 +6707,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) - DBG("Modalias: %s", adapter->modalias); - DBG("Discoverable timeout: %u seconds", adapter->discoverable_timeout); - DBG("Pairable timeout: %u seconds", adapter->pairable_timeout); +@@ -6832,6 +6883,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) + if (blocked > 0) + DBG("Power state: %s", + adapter_power_state_str(adapter->power_state)); + DBG("DelayReport %d", adapter->delay_report); adapter->auths = g_queue_new(); adapter->exps = queue_new(); diff --git a/src/adapter.h b/src/adapter.h -index b09044edd..d327c69b8 100644 +index 78eb069ae..3da7816f2 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -26,6 +26,7 @@ @@ -297,7 +297,7 @@ index b09044edd..d327c69b8 100644 struct btd_gatt_database *btd_adapter_get_database(struct btd_adapter *adapter); diff --git a/src/btd.h b/src/btd.h -index c02b2691e..68d5ccd4a 100644 +index 63be6d8d4..c3f9013b5 100644 --- a/src/btd.h +++ b/src/btd.h @@ -115,6 +115,7 @@ struct btd_opts { diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch index c3830ba1f..93e39fe66 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0013-Implementation-to-get-connectedUuid-s-in-case-of-inc.patch @@ -1,4 +1,4 @@ -From 0db13b98a43f4b473f20a4b6356b392b01b6f5e4 Mon Sep 17 00:00:00 2001 +From 6e5c3988e30450c0babc68686b0c34c2c878ee2e Mon Sep 17 00:00:00 2001 From: Rakes Pani Date: Mon, 6 Apr 2020 12:14:43 +0530 Subject: [PATCH] Implementation to get connectedUuid's in case of incoming @@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [webos specific] 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/device.c b/src/device.c -index 3cad84e37..d8a00a50f 100644 +index efe3a636f..e921261c1 100644 --- a/src/device.c +++ b/src/device.c -@@ -7102,9 +7102,11 @@ static void service_state_changed(struct btd_service *service, +@@ -7121,9 +7121,11 @@ static void service_state_changed(struct btd_service *service, new_state == BTD_SERVICE_STATE_DISCONNECTING) return; diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch index f598fbfd6..a7e01948d 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0014-Fix-for-updating-connected-uuids-when-profile-is-dis.patch @@ -1,4 +1,4 @@ -From 49d6eda0e997100ff60b5114f404e4ebb7f04fdd Mon Sep 17 00:00:00 2001 +From 8c291a6536ea7376d509f9fc4fd624c6e585c4f5 Mon Sep 17 00:00:00 2001 From: "ramya.hegde" Date: Tue, 14 Apr 2020 15:28:07 +0530 Subject: [PATCH] Fix for updating connected uuids when profile is disconnected @@ -24,7 +24,7 @@ Upstream-Status: Inappropriate [webos specific] 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/device.c b/src/device.c -index d8a00a50f..e02c9d87b 100644 +index e921261c1..79874cdbc 100644 --- a/src/device.c +++ b/src/device.c @@ -2576,7 +2576,10 @@ static void device_profile_disconnected(struct btd_device *dev, diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch index 269df593a..fc5598821 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0015-Fix-device-getStatus-not-updated-when-unpaired.patch @@ -1,4 +1,4 @@ -From 9afbc88068ac0db2aee075dd7c96e5c9c5670e5a Mon Sep 17 00:00:00 2001 +From 4edeb82908ed6b0a443893b9ba5bbe0dc82462ca Mon Sep 17 00:00:00 2001 From: Sameer Mulla Date: Mon, 27 Apr 2020 11:56:21 +0530 Subject: [PATCH] Fix device/getStatus not updated when unpaired @@ -29,7 +29,7 @@ Upstream-Status: Inappropriate [webos specific] 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/device.c b/src/device.c -index e02c9d87b..efb55a22d 100644 +index 79874cdbc..be4b1d670 100644 --- a/src/device.c +++ b/src/device.c @@ -1999,13 +1999,13 @@ static void device_profile_connected(struct btd_device *dev, diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch index 60050bb69..b834e8aae 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0016-Set-default-pairing-capability-as-NoInputNoOutput.patch @@ -1,4 +1,4 @@ -From 5a05defa821e458824bdfaf9ee6019849e687554 Mon Sep 17 00:00:00 2001 +From 152936938e500f4234810636b340af367f649aae Mon Sep 17 00:00:00 2001 From: "sungmok.shin" Date: Mon, 20 Apr 2020 19:24:45 +0900 Subject: [PATCH] Set default pairing capability as "NoInputNoOutput" diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch index ad24c505a..93c9629de 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0017-AVRCP-getting-supported-notification-events.patch @@ -1,4 +1,4 @@ -From 6fbb9d13f15635271529c508ba5a82ab5245b61f Mon Sep 17 00:00:00 2001 +From 9c23c9ab97a20f41e0e49b61809ab0e528fb3f37 Mon Sep 17 00:00:00 2001 From: "ramya.hegde" Date: Mon, 11 May 2020 15:54:12 +0530 Subject: [PATCH] AVRCP getting supported notification events @@ -39,7 +39,7 @@ index 61478e913..ff9d9f97d 100644 if (!session->controller || !session->controller->player) return FALSE; diff --git a/src/device.c b/src/device.c -index efb55a22d..6a18c3451 100644 +index be4b1d670..06863a304 100644 --- a/src/device.c +++ b/src/device.c @@ -284,6 +284,7 @@ struct btd_device { diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch index 6fec03064..f767127aa 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0018-Modified-MapInstanceName-MapInstanceProperties-parsi.patch @@ -1,4 +1,4 @@ -From 9336709205cbd1d67f01cc0e841579013c4d254b Mon Sep 17 00:00:00 2001 +From 2aa47e4e4e88b83c3a9a524fc21e69535ec56815 Mon Sep 17 00:00:00 2001 From: Rakes Pani Date: Tue, 14 Jul 2020 10:37:18 +0900 Subject: [PATCH] Modified MapInstanceName & MapInstanceProperties parsing and @@ -25,7 +25,7 @@ Upstream-Status: Inappropriate [webos specific] 1 file changed, 167 insertions(+), 1 deletion(-) diff --git a/src/device.c b/src/device.c -index 6a18c3451..f6635fb13 100644 +index 06863a304..7eed7d739 100644 --- a/src/device.c +++ b/src/device.c @@ -220,6 +220,8 @@ struct btd_device { @@ -222,7 +222,7 @@ index 6a18c3451..f6635fb13 100644 /* Load device id */ source = g_key_file_get_integer(key_file, "DeviceID", "Source", NULL); if (source) { -@@ -4988,6 +5110,29 @@ static int update_record(struct browse_req *req, const char *uuid, +@@ -4998,6 +5120,29 @@ static int update_record(struct browse_req *req, const char *uuid, return 0; } @@ -252,7 +252,7 @@ index 6a18c3451..f6635fb13 100644 static void update_bredr_services(struct browse_req *req, sdp_list_t *recs) { struct btd_device *device = req->device; -@@ -5045,6 +5190,23 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs) +@@ -5055,6 +5200,23 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs) if (!profile_uuid) continue; @@ -276,7 +276,7 @@ index 6a18c3451..f6635fb13 100644 if (bt_uuid_strcmp(profile_uuid, PNP_UUID) == 0) { uint16_t source, vendor, product, version; sdp_data_t *pdlist; -@@ -5223,6 +5385,10 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data) +@@ -5233,6 +5395,10 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data) /* Propagate services changes */ g_dbus_emit_property_changed(dbus_conn, req->device->path, DEVICE_INTERFACE, "UUIDs"); diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch index 22b7ef419..006d9db16 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0019-Enabled-EMAIL-support-based-on-MAPInstance-Name-Modi.patch @@ -1,4 +1,4 @@ -From 9cb46738bbc32fbdb04488e56af02d2c02da3421 Mon Sep 17 00:00:00 2001 +From e32a29502c661bb74e314a70bbc167fb4ede9f70 Mon Sep 17 00:00:00 2001 From: Rakes Pani Date: Wed, 3 Jun 2020 18:08:39 +0530 Subject: [PATCH] Enabled EMAIL support based on MAPInstance Name Modified diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch index da32771c8..63dde1be0 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0020-Disabling-DB-Hash-for-Gatt.patch @@ -1,4 +1,4 @@ -From 6977994366e9391ee1b7d7423ce057898d6e9af4 Mon Sep 17 00:00:00 2001 +From 9ea25f1fd32f0be2772a89ea1fc9ff6f6250560d Mon Sep 17 00:00:00 2001 From: Vibhanshu Dhote Date: Tue, 28 Jul 2020 16:04:27 +0530 Subject: [PATCH] Disabling DB Hash for Gatt @@ -23,7 +23,7 @@ Upstream-Status: Inappropriate [webos specific] 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gatt-database.c b/src/gatt-database.c -index cf651b5f5..9812c3157 100644 +index ea282d4bc..803dad80d 100644 --- a/src/gatt-database.c +++ b/src/gatt-database.c @@ -1191,11 +1191,13 @@ static void db_hash_read_cb(struct gatt_db_attribute *attrib, @@ -41,7 +41,7 @@ index cf651b5f5..9812c3157 100644 state = find_device_state(database, &bdaddr, bdaddr_type); if (state) state->change_aware = true; -@@ -1251,6 +1253,7 @@ static void populate_gatt_service(struct btd_gatt_database *database) +@@ -1252,6 +1254,7 @@ static void populate_gatt_service(struct btd_gatt_database *database) gatt_db_attribute_set_fixed_length(database->cli_feat, CLI_FEAT_SIZE); /* Only expose database hash chrc if supported */ @@ -49,7 +49,7 @@ index cf651b5f5..9812c3157 100644 if (gatt_db_hash_support(database->db)) { bt_uuid16_create(&uuid, GATT_CHARAC_DB_HASH); database->db_hash = gatt_db_service_add_characteristic(service, -@@ -1258,6 +1261,7 @@ static void populate_gatt_service(struct btd_gatt_database *database) +@@ -1259,6 +1262,7 @@ static void populate_gatt_service(struct btd_gatt_database *database) db_hash_read_cb, NULL, database); gatt_db_attribute_set_fixed_length(database->db_hash, 16); } diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch index 3fbffd3f0..53e4863e0 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0021-Added-Notification-property-in-org.bluez.obex.Messag.patch @@ -1,4 +1,4 @@ -From b6fe529764b1e78d4a8fceea2d124816a577687e Mon Sep 17 00:00:00 2001 +From 2d0708acce4d8edd5614325325afc311773f05d2 Mon Sep 17 00:00:00 2001 From: Rakes Pani Date: Fri, 7 Aug 2020 18:32:03 +0530 Subject: [PATCH] Added Notification property in org.bluez.obex.MessageAccess1 diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch index abd3ae93e..63dc22874 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0022-Added-MessageHandle-property-in-org.bluez.obex.Trans.patch @@ -1,4 +1,4 @@ -From ae93a4c8f6d3557f400b1de27f837f06e5a18632 Mon Sep 17 00:00:00 2001 +From e4ead3bf22f422ecb327a8a07c690e9273f81b26 Mon Sep 17 00:00:00 2001 From: Rakes Pani Date: Mon, 10 Aug 2020 13:27:14 +0530 Subject: [PATCH] Added MessageHandle property in org.bluez.obex.Transfer1 diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch index 6eb4df040..da9d846b2 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0023-Create-Message-interface-for-sent-message-related-no.patch @@ -1,4 +1,4 @@ -From 16b74e72a9cd3140c14c6d1cad11647cafadd87c Mon Sep 17 00:00:00 2001 +From 069f04c2d5435dc33ac103b410e545200168a49c Mon Sep 17 00:00:00 2001 From: Rakes Pani Date: Mon, 10 Aug 2020 16:21:17 +0530 Subject: [PATCH] Create Message interface for sent message related diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch index dbebbf6d3..e2f3cb130 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0024-AVRCP-addToNowPlaying-return-error-when-player-not-s.patch @@ -1,4 +1,4 @@ -From c50b0fcaadcbb13d7126cd8ff9abb98debf4c963 Mon Sep 17 00:00:00 2001 +From ec240da85d250db9d33dbb8a72893516fed80c9c Mon Sep 17 00:00:00 2001 From: "ramya.hegde" Date: Tue, 11 Aug 2020 15:18:43 +0530 Subject: [PATCH] AVRCP addToNowPlaying return error when player not supports diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch index ae38d52a0..2533fb84c 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0025-AVRCP-MediaItem-object-path-fix.patch @@ -1,4 +1,4 @@ -From 2c8891c770a2dfeec8b81983ec6e9405f836f96d Mon Sep 17 00:00:00 2001 +From 372e5c5baa5ed2936c833cfb567cd85e0d08f361 Mon Sep 17 00:00:00 2001 From: "ramya.hegde" Date: Tue, 3 Nov 2020 11:32:38 +0530 Subject: [PATCH] AVRCP MediaItem object path fix diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch index ef884f9af..96b5135f3 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0026-Revert-a2dp-Add-reverse-discovery.patch @@ -1,4 +1,4 @@ -From bb79f1fd3219339b80eb940eb03416af87c67c94 Mon Sep 17 00:00:00 2001 +From 3175e56e54dd30e78131be257bd9ffc116cc7d40 Mon Sep 17 00:00:00 2001 From: Sameer Mulla Date: Thu, 12 Nov 2020 15:04:36 +0530 Subject: [PATCH] Revert "a2dp: Add reverse discovery" @@ -29,7 +29,7 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c -index fb6c9f680..26a7450e3 100644 +index 7865bce7f..3fac6207f 100644 --- a/profiles/audio/a2dp.c +++ b/profiles/audio/a2dp.c @@ -633,12 +633,6 @@ static gboolean endpoint_match_codec_ind(struct avdtp *session, diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch index 11be23d4d..fd7aec106 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0027-Add-support-for-meshd-to-use-RAW-channel.patch @@ -1,4 +1,4 @@ -From 2842f40516317da8f71401910995da7d31139fc9 Mon Sep 17 00:00:00 2001 +From c17b168d8b7c2a55f5f085662bc5905caea23086 Mon Sep 17 00:00:00 2001 From: "ramya.hegde" Date: Mon, 25 Jan 2021 16:27:58 +0530 Subject: [PATCH] Add support for meshd to use RAW channel @@ -10,6 +10,12 @@ Add support for meshd to use RAW channel Add support for meshd to use RAW channel so that bluetooth-meshd and bluetoothd can run in parallel +index is no longer private after 5.66 with: + commit 9966cb8b6999a5f54fc13acbd7e1526512a84342 + Author: Brian Gix + Date: Thu Sep 22 15:31:02 2022 -0700 + Subject: mesh: Add new kernel MGMT based IO transport + :Testing Performed: Built and tested @@ -25,11 +31,11 @@ Upstream-Status: Inappropriate [webos specific] mesh/bluetooth-mesh.service.in | 3 ++- mesh/main.c | 14 ++++++++---- - mesh/mesh-io-generic.c | 38 +++++++++++++++++++++++++------ + mesh/mesh-io-generic.c | 32 ++++++++++++++++++++++++---- mesh/mesh-io.h | 4 ++++ - mesh/mesh-mgmt.c | 41 +++++++++++++++++++++++++++++++++- + mesh/mesh-mgmt.c | 39 ++++++++++++++++++++++++++++++++++ mesh/mesh-mgmt.h | 1 + - 6 files changed, 88 insertions(+), 13 deletions(-) + 6 files changed, 84 insertions(+), 9 deletions(-) diff --git a/mesh/bluetooth-mesh.service.in b/mesh/bluetooth-mesh.service.in index c8afbf53e..ee65ce485 100644 @@ -46,7 +52,7 @@ index c8afbf53e..ee65ce485 100644 LimitNPROC=1 ProtectHome=true diff --git a/mesh/main.c b/mesh/main.c -index dd99c3085..c68530faf 100644 +index 3bca020a0..b807fc0e7 100644 --- a/mesh/main.c +++ b/mesh/main.c @@ -36,6 +36,7 @@ static const char *storage_dir; @@ -65,10 +71,10 @@ index dd99c3085..c68530faf 100644 { "help", no_argument, NULL, 'h' }, { } }; -@@ -138,10 +140,11 @@ static void signal_handler(uint32_t signo, void *user_data) - static bool parse_io(const char *optarg, enum mesh_io_type *type, void **opts) - { - if (strstr(optarg, "generic") == optarg) { +@@ -175,10 +177,11 @@ static bool parse_io(const char *optarg, enum mesh_io_type *type, void **opts) + + return false; + } else if (strstr(optarg, "generic") == optarg) { - int *index = l_new(int, 1); - + struct mesh_io_opts *m_io_opts = l_new(struct mesh_io_opts, 1); @@ -80,7 +86,7 @@ index dd99c3085..c68530faf 100644 optarg += strlen("generic"); if (!*optarg) { -@@ -204,7 +207,7 @@ int main(int argc, char *argv[]) +@@ -241,7 +244,7 @@ int main(int argc, char *argv[]) for (;;) { int opt; @@ -89,7 +95,7 @@ index dd99c3085..c68530faf 100644 NULL); if (opt < 0) break; -@@ -239,6 +242,9 @@ int main(int argc, char *argv[]) +@@ -276,6 +279,9 @@ int main(int argc, char *argv[]) case 'b': dbus_debug = true; break; @@ -100,10 +106,10 @@ index dd99c3085..c68530faf 100644 usage(); status = EXIT_SUCCESS; diff --git a/mesh/mesh-io-generic.c b/mesh/mesh-io-generic.c -index 2d7ef261e..40cf0e521 100644 +index 827128ec8..e9630e083 100644 --- a/mesh/mesh-io-generic.c +++ b/mesh/mesh-io-generic.c -@@ -40,6 +40,7 @@ struct mesh_io_private { +@@ -39,6 +39,7 @@ struct mesh_io_private { uint16_t interval; bool sending; bool active; @@ -111,7 +117,7 @@ index 2d7ef261e..40cf0e521 100644 }; struct pvt_rx_reg { -@@ -259,8 +260,11 @@ static void configure_hci(struct mesh_io_private *io) +@@ -258,8 +259,11 @@ static void configure_hci(struct mesh_io_private *io) /* TODO: Move to suitable place. Set suitable masks */ /* Reset Command */ @@ -125,49 +131,42 @@ index 2d7ef261e..40cf0e521 100644 /* Read local supported commands */ bt_hci_send(io->hci, BT_HCI_CMD_READ_LOCAL_COMMANDS, NULL, 0, -@@ -392,10 +396,26 @@ static void hci_init(void *user_data) +@@ -388,7 +392,22 @@ static void hci_init(void *user_data) + if (io->pvt->hci) bt_hci_unref(io->pvt->hci); - } -- io->pvt->hci = bt_hci_new_user_channel(io->pvt->index); -- if (!io->pvt->hci) { +- io->pvt->hci = bt_hci_new_user_channel(io->index); + if (io->pvt->use_raw) + { + l_debug("Use HCI RAW channel"); + + /* Power up HCI device */ + uint16_t mode = 0x01; -+ if (!set_powered(mode, io->pvt->index)) ++ if (!set_powered(mode, io->index)) + return; + -+ io->pvt->hci = bt_hci_new_raw_device(io->pvt->index); ++ io->pvt->hci = bt_hci_new_raw_device(io->index); + } + else + { + l_debug("Use HCI USER channel"); -+ io->pvt->hci = bt_hci_new_user_channel(io->pvt->index); ++ io->pvt->hci = bt_hci_new_user_channel(io->index); + } -+ if (!io->pvt->hci) -+ { - l_error("Failed to start mesh io (hci %u): %s", io->pvt->index, -- strerror(errno)); -+ strerror(errno)); - result = false; - } - -@@ -436,7 +456,10 @@ static bool dev_init(struct mesh_io *io, void *opts, + if (!io->pvt->hci) { + l_error("Failed to start mesh io (hci %u): %s", io->index, + strerror(errno)); +@@ -416,6 +435,10 @@ static bool dev_init(struct mesh_io *io, void *opts, void *user_data) return false; io->pvt = l_new(struct mesh_io_private, 1); -- io->pvt->index = *(int *)opts; + struct mesh_io_opts *io_opts; + io_opts = (struct mesh_io_opts *)opts; -+ io->pvt->index = io_opts->index; ++ io->index = io_opts->index; + io->pvt->use_raw = io_opts->use_raw; io->pvt->rx_regs = l_queue_new(); io->pvt->tx_pkts = l_queue_new(); -@@ -847,7 +870,8 @@ static bool recv_register(struct mesh_io *io, const uint8_t *filter, +@@ -822,7 +845,8 @@ static bool recv_register(struct mesh_io *io, const uint8_t *filter, if (l_queue_find(pvt->rx_regs, find_active, NULL)) active = true; @@ -178,10 +177,10 @@ index 2d7ef261e..40cf0e521 100644 cmd.enable = 0x00; /* Disable scanning */ cmd.filter_dup = 0x00; /* Report duplicates */ diff --git a/mesh/mesh-io.h b/mesh/mesh-io.h -index 80ef3fa3e..fdf5eb6b1 100644 +index 9dd946cdf..ed067abe6 100644 --- a/mesh/mesh-io.h +++ b/mesh/mesh-io.h -@@ -30,6 +30,10 @@ struct mesh_io_recv_info { +@@ -32,6 +32,10 @@ struct mesh_io_recv_info { uint8_t chan; int8_t rssi; }; @@ -193,11 +192,11 @@ index 80ef3fa3e..fdf5eb6b1 100644 struct mesh_io_send_info { enum mesh_io_timing_type type; diff --git a/mesh/mesh-mgmt.c b/mesh/mesh-mgmt.c -index 754093dbc..7e039498c 100644 +index d37aeb5ac..eb7831cc5 100644 --- a/mesh/mesh-mgmt.c +++ b/mesh/mesh-mgmt.c -@@ -43,6 +43,45 @@ static void process_read_info_req(void *data, void *user_data) - reg->cb(index, reg->user_data); +@@ -86,6 +86,45 @@ static void set_exp_mesh_cb(uint8_t status, uint16_t length, + features_cb, L_UINT_TO_PTR(index), NULL); } +static void set_powered_complete(uint8_t status, uint16_t length, @@ -242,21 +241,12 @@ index 754093dbc..7e039498c 100644 static void read_info_cb(uint8_t status, uint16_t length, const void *param, void *user_data) { -@@ -71,7 +110,7 @@ static void read_info_cb(uint8_t status, uint16_t length, - - if (current_settings & MGMT_SETTING_POWERED) { - l_info("Controller hci %u is in use", index); -- return; -+ //return; - } - - if (!(supported_settings & MGMT_SETTING_LE)) { diff --git a/mesh/mesh-mgmt.h b/mesh/mesh-mgmt.h -index 90ac14e73..1fdb25646 100644 +index a3cd72faf..6dde5c725 100644 --- a/mesh/mesh-mgmt.h +++ b/mesh/mesh-mgmt.h -@@ -12,3 +12,4 @@ - typedef void (*mesh_mgmt_read_info_func_t)(int index, void *user_data); - - bool mesh_mgmt_list(mesh_mgmt_read_info_func_t cb, void *user_data); +@@ -22,3 +22,4 @@ unsigned int mesh_mgmt_register(uint16_t event, uint16_t index, + void *user_data, mgmt_destroy_func_t destroy); + bool mesh_mgmt_unregister(unsigned int id); + void mesh_mgmt_destroy(void); +bool set_powered(uint16_t mode, int index); diff --git a/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch b/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch index 22bc58a67..300a1f77c 100644 --- a/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch +++ b/meta-webos/recipes-connectivity/bluez5/bluez5/0028-Enable-mesh-fixed-ell-undefined-symbol-error.patch @@ -1,4 +1,4 @@ -From c5b7cb2aa745e73fdd44369baab9b6b732c90c30 Mon Sep 17 00:00:00 2001 +From 38b36da247b14a48179260320948ad6cd51c24d0 Mon Sep 17 00:00:00 2001 From: "shoyeb.khan" Date: Wed, 27 Jan 2021 03:34:27 +0530 Subject: [PATCH] Enable mesh & fixed ell undefined symbol error @@ -26,10 +26,10 @@ Upstream-Status: Inappropriate [webos specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 1ad6398e1..d61ad70b6 100644 +index 7041f8eeb..87adacff9 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -675,7 +675,7 @@ ell/internal: Makefile +@@ -683,7 +683,7 @@ ell/internal: Makefile fi \ done > $@