fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-02-03 23:00:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux: Hide duplicate Logitech Bluetooth devices

Browse source 
A lot of newer Logitech devices support both the BATT Bluetooth LE
service as well the HID++ protocol. This advertises 2 separate battery
interfaces, one HID++ one through the kernel, one BATT one through
BlueZ.

Avoid confusing UIs and hide the Bluetooth battery from the interface by
checking for duplicates each time a new device is added.

Closes: #166
This commit is contained in:
Bastien Nocera 2022-09-02 11:42:24 +02:00
parent d998510753
commit 778b93a336
1 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/linux/up-backend.c
View file

@ -54,6 +54,8 @@ static void up_backend_finalize (GObject *object);
#define LOGIND_DBUS_PATH "/org/freedesktop/login1"
#define LOGIND_DBUS_INTERFACE "org.freedesktop.login1.Manager"
#define BDADDR_STR_LEN 17
struct UpBackendPrivate
{
UpDaemon *daemon;
@ -116,6 +118,59 @@ up_backend_uevent_signal_handler_cb (GUdevClient *client, const gchar *action,
}
}
static UpDevice *
find_duplicate_device (UpBackend *backend,
UpDevice *device)
{
gboolean other_device_is_bluez = !UP_IS_DEVICE_BLUEZ (device);
GPtrArray *array;
g_autofree char *serial = NULL;
UpDevice *ret = NULL;
guint i;
g_object_get (G_OBJECT (device), "serial", &serial, NULL);
array = up_device_list_get_array (backend->priv->device_list);
for (i = 0; i < array->len; i++) {
g_autofree char *s = NULL;
UpDevice *d;
d = UP_DEVICE (g_ptr_array_index (array, i));
if (UP_IS_DEVICE_BLUEZ (d) != other_device_is_bluez)
continue;
g_object_get (G_OBJECT (d), "serial", &s, NULL);
if (s && g_ascii_strncasecmp (s, serial, BDADDR_STR_LEN) == 0) {
ret = g_object_ref (d);
break;
}
}
g_ptr_array_unref (array);
return ret;
}
static void
update_duplicate_bluez_device (UpBackend *backend,
UpDevice *added_device)
{
g_autoptr(UpDevice) other_device = NULL;
UpDevice *bluez_device = NULL;
g_autofree char *name = NULL;
g_autofree char *serial = NULL;
other_device = find_duplicate_device (backend, added_device);
if (!other_device)
return;
bluez_device = UP_IS_DEVICE_BLUEZ (added_device) ?
added_device : other_device;
g_object_bind_property (bluez_device, "model",
other_device, "model",
G_BINDING_SYNC_CREATE);
g_object_get (G_OBJECT (bluez_device), "serial", &serial, NULL);
up_device_unregister (bluez_device);
g_debug ("Hiding duplicate BlueZ device %s", serial);
}
static gboolean
is_interesting_iface_proxy (GDBusProxy *interface_proxy)
{
@ -210,6 +265,7 @@ bluez_interface_added (GDBusObjectManager *manager,
NULL);
if (device) {
g_debug ("emitting device-added: %s", g_dbus_object_get_object_path (bus_object));
update_duplicate_bluez_device (backend, device);
g_signal_emit (backend, signals[SIGNAL_DEVICE_ADDED], 0, device);
}
}
@ -303,6 +359,7 @@ static void
udev_device_added_cb (UpBackend *backend, UpDevice *device)
{
g_debug ("Got new device from udev enumerator: %p", device);
update_duplicate_bluez_device (backend, device);
g_signal_emit (backend, signals[SIGNAL_DEVICE_ADDED], 0, device);
}