Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Message-ID: <89ceb9e5d67485c19d0f139ac0825cf008491ebb.camel@gmail.com>
Subject: [PATCH BlueZ]: adapter: Add Version and Manufacturer props to
 org.bluez.Adapter1.
From:   vibhavp@gmail.com
To:     linux-bluetooth@vger.kernel.org
Date:   Tue, 19 Sep 2023 17:47:47 +0530
Content-Type: multipart/signed; micalg="pgp-sha256";
        protocol="application/pgp-signature"; boundary="=-ZBzt+E44ZB+2L3S/scR4"
User-Agent: Evolution 3.48.4 
MIME-Version: 1.0
Precedence: bulk


--=-ZBzt+E44ZB+2L3S/scR4
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

From: Vibhav Pant <vibhavp@gmail.com>

This allows DBus clients to find an adapter's version and
manufacturer company code without querying the management API.

Signed-off-by: Vibhav Pant <vibhavp@gmail.com>
---
 doc/adapter-api.txt | 11 +++++++++++
 src/adapter.c       | 28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/doc/adapter-api.txt b/doc/adapter-api.txt
index d38ce7171..10c290c62 100644
--- a/doc/adapter-api.txt
+++ b/doc/adapter-api.txt
@@ -360,3 +360,14 @@ Properties	string Address [readonly]
=20
 			List of 128-bit UUIDs that represents the
experimental
 			features currently enabled.
+
+		uint16 Manufacturer [readonly]
+
+			The manufacturer of the device, as a uint16
company
+			identifier defined by the Core Bluetooth
Specification.
+
+		byte Version [readonly]
+
+			The Bluetooth version supported by the device,
as a
+			core version code defined by the Core
Bluetooth
+			Specification.
diff --git a/src/adapter.c b/src/adapter.c
index 5ebfc4752..8f67a6826 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -260,6 +260,7 @@ struct btd_adapter {
=20
 	bdaddr_t bdaddr;		/* controller Bluetooth
address */
 	uint8_t bdaddr_type;		/* address type */
+	uint8_t version;                /* controller core spec
version */
 	uint32_t dev_class;		/* controller class of device
*/
 	char *name;			/* controller device name */
 	char *short_name;		/* controller short name */
@@ -3540,6 +3541,29 @@ static gboolean
property_experimental_exists(const GDBusPropertyTable *property,
 	return !queue_isempty(adapter->exps);
 }
=20
+static gboolean property_get_manufacturer(const GDBusPropertyTable
*property,
+					  DBusMessageIter *iter,
+					  void *user_data)
+{
+	struct btd_adapter *adapter =3D user_data;
+	dbus_uint16_t val =3D adapter->manufacturer;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &val);
+
+	return TRUE;
+}
+
+static gboolean property_get_version(const GDBusPropertyTable
*property,
+				     DBusMessageIter *iter, void
*user_data)
+{
+	struct btd_adapter *adapter =3D user_data;
+	uint8_t val =3D adapter->version;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &val);
+
+	return TRUE;
+}
+
 static DBusMessage *remove_device(DBusConnection *conn,
 					DBusMessage *msg, void
*user_data)
 {
@@ -3898,6 +3922,8 @@ static const GDBusPropertyTable
adapter_properties[] =3D {
 	{ "Roles", "as", property_get_roles },
 	{ "ExperimentalFeatures", "as", property_get_experimental,
NULL,
 					property_experimental_exists
},
+	{ "Manufacturer", "q", property_get_manufacturer },
+	{ "Version", "y", property_get_version },
 	{ }
 };
=20
@@ -10162,6 +10188,8 @@ static void read_info_complete(uint8_t status,
uint16_t length,
 	adapter->supported_settings =3D btohl(rp->supported_settings);
 	adapter->current_settings =3D btohl(rp->current_settings);
=20
+	adapter->version =3D rp->version;
+
 	clear_uuids(adapter);
 	clear_devices(adapter);
=20
--=20
2.42.0


--=-ZBzt+E44ZB+2L3S/scR4
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----

iQFGBAABCAAwFiEEftHUjFE8oCS+Onhf4/soy2q1lZgFAmUJkWsSHHZpYmhhdnBA
Z21haWwuY29tAAoJEOP7KMtqtZWY8H4IAMHvGq4+SD8cHOglpeB7xT2VTxgfNojf
iBsF3Ww6UiRkd6n7cPPAZ4161jro4HIjUzAnoOjG70ABwVxIb/BbwcM85ZlA4Ye8
jIVuqrequ/sgobXIAvribL8Yh1m+Z8b8cdjN9bBDo9q36CYSjb+TfBn1JQ6bjhTf
PzsbjZg99y1grRwk/zhrSTN3rXMSx0N1n1SY/bNm+jWtbGkX4evyn5VUn4XfXu2S
wyPgvdLLekayJFvM4Ti9c3tZVm4fzyBVGECuJsF/L29oQ4c+TNKXEJQUI69Myswy
iTUhcoc26pH3b3RDh5cxWvK2ETk7fzy2ahRRJvFjox5XPmoc/LI/zlw=
=uEk+
-----END PGP SIGNATURE-----

--=-ZBzt+E44ZB+2L3S/scR4--