mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-28 08:37:12 +00:00
chore: Add missing patch files
This commit is contained in:
parent
77a6947038
commit
6dd5c7b19d
@ -0,0 +1,67 @@
|
||||
From 036583f9bbec8540fbd85b980674aad4916d3093 Mon Sep 17 00:00:00 2001
|
||||
From: Dimitris <dimitris.on.linux@gmail.com>
|
||||
Date: Thu, 4 Apr 2024 11:30:50 -0700
|
||||
Subject: [PATCH] device: Add btd_device_bearer_is_connected
|
||||
|
||||
This adds btd_device_bearer_is_connected and use it when testing if
|
||||
device needs to be disconnected.
|
||||
|
||||
Fixes: https://github.com/bluez/bluez/issues/785
|
||||
---
|
||||
src/adapter.c | 2 +-
|
||||
src/device.c | 7 ++++++-
|
||||
src/device.h | 1 +
|
||||
3 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/adapter.c b/src/adapter.c
|
||||
index 4bcc464de..017e60233 100644
|
||||
--- a/src/adapter.c
|
||||
+++ b/src/adapter.c
|
||||
@@ -7486,7 +7486,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter,
|
||||
device_cancel_authentication(device, TRUE);
|
||||
|
||||
/* If another bearer is still connected */
|
||||
- if (btd_device_is_connected(device))
|
||||
+ if (btd_device_bearer_is_connected(device))
|
||||
return;
|
||||
|
||||
adapter->connections = g_slist_remove(adapter->connections, device);
|
||||
diff --git a/src/device.c b/src/device.c
|
||||
index 5e74633c6..74dd67a09 100644
|
||||
--- a/src/device.c
|
||||
+++ b/src/device.c
|
||||
@@ -3273,13 +3273,18 @@ uint8_t btd_device_get_bdaddr_type(struct btd_device *dev)
|
||||
|
||||
bool btd_device_is_connected(struct btd_device *dev)
|
||||
{
|
||||
- if (dev->bredr_state.connected || dev->le_state.connected)
|
||||
+ if (btd_device_bearer_is_connected(dev))
|
||||
return true;
|
||||
|
||||
return find_service_with_state(dev->services,
|
||||
BTD_SERVICE_STATE_CONNECTED);
|
||||
}
|
||||
|
||||
+bool btd_device_bearer_is_connected(struct btd_device *dev)
|
||||
+{
|
||||
+ return dev->bredr_state.connected || dev->le_state.connected;
|
||||
+}
|
||||
+
|
||||
static void clear_temporary_timer(struct btd_device *dev)
|
||||
{
|
||||
if (dev->temporary_timer) {
|
||||
diff --git a/src/device.h b/src/device.h
|
||||
index d4e70b7ef..5722ca9ca 100644
|
||||
--- a/src/device.h
|
||||
+++ b/src/device.h
|
||||
@@ -104,6 +104,7 @@ void device_set_rssi(struct btd_device *device, int8_t rssi);
|
||||
void device_set_tx_power(struct btd_device *device, int8_t tx_power);
|
||||
void device_set_flags(struct btd_device *device, uint8_t flags);
|
||||
bool btd_device_is_connected(struct btd_device *dev);
|
||||
+bool btd_device_bearer_is_connected(struct btd_device *dev);
|
||||
uint8_t btd_device_get_bdaddr_type(struct btd_device *dev);
|
||||
bool device_is_retrying(struct btd_device *device);
|
||||
void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
|
||||
--
|
||||
2.44.0
|
||||
|
@ -0,0 +1,57 @@
|
||||
From 9a0e675193666a36d76fe7da89fdd74ef50217a5 Mon Sep 17 00:00:00 2001
|
||||
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||||
Date: Mon, 18 Mar 2024 16:08:31 +0000
|
||||
Subject: [PATCH] device: Fix device_is_connected checking for services being
|
||||
connected
|
||||
|
||||
Change 44d3f67277f83983e1e9697eda7b9aeb40ca231d since to have introduced
|
||||
quite a few bugs related to device_is_connected return true which
|
||||
prevents proper cleanup of connection.
|
||||
|
||||
Fixes: https://github.com/bluez/bluez/issues/774
|
||||
Fixes: https://github.com/bluez/bluez/issues/778
|
||||
Fixes: https://github.com/bluez/bluez/issues/783
|
||||
Fixes: https://github.com/bluez/bluez/issues/784
|
||||
---
|
||||
src/device.c | 22 ++++++++++++----------
|
||||
1 file changed, 12 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/device.c b/src/device.c
|
||||
index aecceb100..b5b574233 100644
|
||||
--- a/src/device.c
|
||||
+++ b/src/device.c
|
||||
@@ -3324,22 +3324,24 @@ void device_add_connection(struct btd_device *dev, uint8_t bdaddr_type,
|
||||
"Connected");
|
||||
}
|
||||
|
||||
+static bool device_service_connected(struct btd_device *dev)
|
||||
+{
|
||||
+ if (find_service_with_state(dev->services,
|
||||
+ BTD_SERVICE_STATE_CONNECTING))
|
||||
+ return true;
|
||||
+
|
||||
+ return find_service_with_state(dev->services,
|
||||
+ BTD_SERVICE_STATE_CONNECTED);
|
||||
+}
|
||||
+
|
||||
static bool device_disappeared(gpointer user_data)
|
||||
{
|
||||
struct btd_device *dev = user_data;
|
||||
|
||||
- if (btd_device_is_connected(dev)) {
|
||||
- char addr[18];
|
||||
- ba2str(&dev->bdaddr, addr);
|
||||
- DBG("Device %s is marked as connected", dev->path);
|
||||
- return TRUE;
|
||||
- }
|
||||
-
|
||||
- /* If there are services connecting restart the timer to give more time
|
||||
+ /* If there are services connected restart the timer to give more time
|
||||
* for the service to either complete the connection or disconnect.
|
||||
*/
|
||||
- if (find_service_with_state(dev->services,
|
||||
- BTD_SERVICE_STATE_CONNECTING))
|
||||
+ if (device_service_connected(dev))
|
||||
return TRUE;
|
||||
|
||||
dev->temporary_timer = 0;
|
@ -1,28 +0,0 @@
|
||||
From 70309219acd4c81e3a9e2b3652d2d93eb08b0aee Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 31 Aug 2022 11:16:34 +0200
|
||||
Subject: [PATCH 6/6] adapter: Remove experimental flag for PowerState
|
||||
|
||||
Now that the feature has been tested, that the API is deemed adequate
|
||||
and the reliability sufficient.
|
||||
---
|
||||
src/adapter.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/adapter.c b/src/adapter.c
|
||||
index 8fb2acdc8..841096d7f 100644
|
||||
--- a/src/adapter.c
|
||||
+++ b/src/adapter.c
|
||||
@@ -3864,8 +3864,7 @@ static const GDBusPropertyTable adapter_properties[] = {
|
||||
{ "Alias", "s", property_get_alias, property_set_alias },
|
||||
{ "Class", "u", property_get_class },
|
||||
{ "Powered", "b", property_get_powered, property_set_powered },
|
||||
- { "PowerState", "s", property_get_power_state, NULL, NULL,
|
||||
- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
|
||||
+ { "PowerState", "s", property_get_power_state },
|
||||
{ "Discoverable", "b", property_get_discoverable,
|
||||
property_set_discoverable },
|
||||
{ "DiscoverableTimeout", "u", property_get_discoverable_timeout,
|
||||
--
|
||||
2.37.2
|
||||
|
Loading…
x
Reference in New Issue
Block a user