Hi Ludovico,
On Wed, Apr 23, 2025 at 10:41 AM Ludovico de Nittis
<ludovico.denittis@xxxxxxxxxxxxx> wrote:
>
> This adds initial support for a new SixaxisCablePairing property.
> The property can be used to set a device as being a "real" Sixaxis
> gamepad and then handle it differently when needed.
> ---
> doc/org.bluez.Device.rst | 6 ++++++
> src/device.c | 44 ++++++++++++++++++++++++++++++++++++++++
> src/device.h | 3 +++
> 3 files changed, 53 insertions(+)
>
> diff --git a/doc/org.bluez.Device.rst b/doc/org.bluez.Device.rst
> index 13328249b..2d85d0dc2 100644
> --- a/doc/org.bluez.Device.rst
> +++ b/doc/org.bluez.Device.rst
> @@ -279,6 +279,12 @@ boolean LegacyPairing [readonly]
> Bluetooth 2.1 (or newer) devices that have disabled Extended Inquiry
> Response support.
>
> +boolean SixaxisCablePairing [readonly]
> +``````````````````````````````````````
> +
> + Set to true if the device was paired using the Sixaxis USB custom protocol.
> + If true, the device connection will happen without enforcing encryption.
Can't we make this more generic and just call it CablePairing? For the
core I don't think it really matters what method of cable pairing it
was used.
> string Modalias [readonly, optional]
> ````````````````````````````````````
>
> diff --git a/src/device.c b/src/device.c
> index b82a905f9..b11b5c8e4 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -239,6 +239,7 @@ struct btd_device {
> GSList *watches; /* List of disconnect_data */
> bool temporary;
> bool connectable;
> + bool sixaxis_cable_pairing;
> unsigned int disconn_timer;
> unsigned int discov_timer;
> unsigned int temporary_timer; /* Temporary/disappear timer */
> @@ -507,6 +508,9 @@ static gboolean store_device_info_cb(gpointer user_data)
> g_key_file_set_boolean(key_file, "General", "Blocked",
> device->blocked);
>
> + g_key_file_set_boolean(key_file, "General", "SixaxisCablePairing",
> + device->sixaxis_cable_pairing);
> +
> if (device->wake_override != WAKE_FLAG_DEFAULT) {
> g_key_file_set_boolean(key_file, "General", "WakeAllowed",
> device->wake_override ==
> @@ -908,6 +912,11 @@ bool btd_device_is_trusted(struct btd_device *device)
> return device->trusted;
> }
>
> +bool device_is_sixaxis_cable_pairing(struct btd_device *device)
> +{
> + return device->sixaxis_cable_pairing;
> +}
> +
> static gboolean dev_property_get_address(const GDBusPropertyTable *property,
> DBusMessageIter *iter, void *data)
> {
> @@ -1153,6 +1162,17 @@ static gboolean dev_property_get_legacy(const GDBusPropertyTable *property,
> return TRUE;
> }
>
> +static gboolean dev_property_get_sixaxis_cable_pairing(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct btd_device *device = data;
> + dbus_bool_t val = device->sixaxis_cable_pairing;
> +
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val);
> +
> + return TRUE;
> +}
> +
> static gboolean dev_property_get_rssi(const GDBusPropertyTable *property,
> DBusMessageIter *iter, void *data)
> {
> @@ -3483,6 +3503,7 @@ static const GDBusPropertyTable device_properties[] = {
> { "Trusted", "b", dev_property_get_trusted, dev_property_set_trusted },
> { "Blocked", "b", dev_property_get_blocked, dev_property_set_blocked },
> { "LegacyPairing", "b", dev_property_get_legacy },
> + { "SixaxisCablePairing", "b", dev_property_get_sixaxis_cable_pairing },
> { "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi },
> { "Connected", "b", dev_property_get_connected },
> { "UUIDs", "as", dev_property_get_uuids },
> @@ -4062,6 +4083,9 @@ next:
> if (blocked)
> device_block(device, FALSE);
>
> + device->sixaxis_cable_pairing = g_key_file_get_boolean(key_file, "General",
> + "SixaxisCablePairing", NULL);
> +
> /* Load device profile list */
> uuids = g_key_file_get_string_list(key_file, "General", "Services",
> NULL, NULL);
> @@ -4857,6 +4881,9 @@ void device_merge_duplicate(struct btd_device *dev, struct btd_device *dup)
> dev->trusted = dup->trusted;
> dev->blocked = dup->blocked;
>
> + /* Skip sixaxis_cable_pairing property because it doesn't support LE, so we
> + * never expect to have a duplicate device in that case */
> +
> for (l = dup->uuids; l; l = g_slist_next(l))
> dev->uuids = g_slist_append(dev->uuids, g_strdup(l->data));
>
> @@ -6416,6 +6443,23 @@ void device_set_legacy(struct btd_device *device, bool legacy)
> DEVICE_INTERFACE, "LegacyPairing");
> }
>
> +void device_set_sixaxis_cable_pairing(struct btd_device *device,
> + gboolean sixaxis_cable_pairing)
> +{
> + if (!device)
> + return;
> +
> + if (device->sixaxis_cable_pairing == sixaxis_cable_pairing)
> + return;
> +
> + DBG("setting sixaxis cable pairing %d", sixaxis_cable_pairing);
> +
> + device->sixaxis_cable_pairing = sixaxis_cable_pairing;
> +
> + g_dbus_emit_property_changed(dbus_conn, device->path,
> + DEVICE_INTERFACE, "SixaxisCablePairing");
> +}
> +
> void device_store_svc_chng_ccc(struct btd_device *device, uint8_t bdaddr_type,
> uint16_t value)
> {
> diff --git a/src/device.h b/src/device.h
> index 2e4a9771d..c0fa6ec3a 100644
> --- a/src/device.h
> +++ b/src/device.h
> @@ -94,6 +94,7 @@ bool device_is_connectable(struct btd_device *device);
> bool device_is_paired(struct btd_device *device, uint8_t bdaddr_type);
> bool device_is_bonded(struct btd_device *device, uint8_t bdaddr_type);
> bool btd_device_is_trusted(struct btd_device *device);
> +bool device_is_sixaxis_cable_pairing(struct btd_device *device);
> void device_set_paired(struct btd_device *dev, uint8_t bdaddr_type);
> void device_set_unpaired(struct btd_device *dev, uint8_t bdaddr_type);
> void btd_device_set_temporary(struct btd_device *device, bool temporary);
> @@ -101,6 +102,8 @@ void btd_device_set_trusted(struct btd_device *device, gboolean trusted);
> void btd_device_set_connectable(struct btd_device *device, bool connectable);
> void device_set_bonded(struct btd_device *device, uint8_t bdaddr_type);
> void device_set_legacy(struct btd_device *device, bool legacy);
> +void device_set_sixaxis_cable_pairing(struct btd_device *device,
> + gboolean sixaxis_cable_pairing);
> void device_set_rssi_with_delta(struct btd_device *device, int8_t rssi,
> int8_t delta_threshold);
> void device_set_rssi(struct btd_device *device, int8_t rssi);
> --
> 2.49.0
>
>
--
Luiz Augusto von Dentz
