From: Archie Pusaka <apusaka@google.com>
To: linux-bluetooth <linux-bluetooth@vger.kernel.org>,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Archie Pusaka <apusaka@chromium.org>,
Alain Michaud <alainm@chromium.org>
Subject: [Bluez PATCH v2 1/2] device: add device_remove_bonding function
Date: Sat, 27 Jun 2020 23:54:07 +0800 [thread overview]
Message-ID: <20200627235318.Bluez.v2.1.I1322f6745fa50365c1c88de3e2c50c9c5962c094@changeid> (raw)
From: Archie Pusaka <apusaka@chromium.org>
This patch splits the "bonding removal" function in device.c,
because we need to remove bonding information when receiving
"virtual cable unplug" in HID profile.
Reviewed-by: Alain Michaud <alainm@chromium.org>
---
Changes in v2: None
src/device.c | 25 +++++++++++++++----------
src/device.h | 1 +
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/device.c b/src/device.c
index 7b0eb256e..9fb0e018c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -4162,6 +4162,17 @@ static void delete_folder_tree(const char *dirname)
rmdir(dirname);
}
+void device_remove_bonding(struct btd_device *device, uint8_t bdaddr_type)
+{
+ if (bdaddr_type == BDADDR_BREDR)
+ device->bredr_state.bonded = false;
+ else
+ device->le_state.bonded = false;
+
+ btd_adapter_remove_bonding(device->adapter, &device->bdaddr,
+ bdaddr_type);
+}
+
static void device_remove_stored(struct btd_device *device)
{
char device_addr[18];
@@ -4170,17 +4181,11 @@ static void device_remove_stored(struct btd_device *device)
char *data;
gsize length = 0;
- if (device->bredr_state.bonded) {
- device->bredr_state.bonded = false;
- btd_adapter_remove_bonding(device->adapter, &device->bdaddr,
- BDADDR_BREDR);
- }
+ if (device->bredr_state.bonded)
+ device_remove_bonding(device, BDADDR_BREDR);
- if (device->le_state.bonded) {
- device->le_state.bonded = false;
- btd_adapter_remove_bonding(device->adapter, &device->bdaddr,
- device->bdaddr_type);
- }
+ if (device->le_state.bonded)
+ device_remove_bonding(device, device->bdaddr_type);
device->bredr_state.paired = false;
device->le_state.paired = false;
diff --git a/src/device.h b/src/device.h
index 06b100499..907c7c5c4 100644
--- a/src/device.h
+++ b/src/device.h
@@ -49,6 +49,7 @@ uint16_t btd_device_get_vendor(struct btd_device *device);
uint16_t btd_device_get_vendor_src(struct btd_device *device);
uint16_t btd_device_get_product(struct btd_device *device);
uint16_t btd_device_get_version(struct btd_device *device);
+void device_remove_bonding(struct btd_device *device, uint8_t bdaddr_type);
void device_remove(struct btd_device *device, gboolean remove_stored);
int device_address_cmp(gconstpointer a, gconstpointer b);
int device_bdaddr_cmp(gconstpointer a, gconstpointer b);
--
2.27.0.212.ge8ba1cc988-goog
next reply other threads:[~2020-06-27 15:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-27 15:54 Archie Pusaka [this message]
2020-06-27 15:54 ` [Bluez PATCH v2 2/2] input: Remove bonding info when receiving virtual cable unplug Archie Pusaka
2020-07-07 9:34 ` Archie Pusaka
2020-07-07 18:02 ` [Bluez PATCH v2 1/2] device: add device_remove_bonding function Luiz Augusto von Dentz
2020-07-08 4:30 ` Archie Pusaka
2020-07-14 4:50 ` Archie Pusaka
2020-07-14 17:09 ` Luiz Augusto von Dentz
2020-07-15 14:15 ` Archie Pusaka
2020-07-15 17:31 ` Luiz Augusto von Dentz
2020-07-16 7:28 ` Archie Pusaka
2020-07-16 16:14 ` Luiz Augusto von Dentz
2020-07-16 18:10 ` Archie Pusaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200627235318.Bluez.v2.1.I1322f6745fa50365c1c88de3e2c50c9c5962c094@changeid \
--to=apusaka@google.com \
--cc=alainm@chromium.org \
--cc=apusaka@chromium.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).