From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH] android/daemon: Save adapter name on complete event
Date: Tue, 5 Nov 2013 12:08:48 +0200 [thread overview]
Message-ID: <1383646128-8077-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <CABBYNZKJV-h82WQ5_J3z+ArC3=Gy00qTpKHhWSF7v+fFC7KTrA@mail.gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Saving adapter name was missing from set name complete event.
Refactor code to function and reuse it in both places where
name is changed.
---
android/adapter.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/android/adapter.c b/android/adapter.c
index b6f6096..6b0dc8b 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -88,6 +88,17 @@ static void adapter_name_changed(const uint8_t *name)
HAL_EV_ADAPTER_PROPS_CHANGED, sizeof(buf), ev, -1);
}
+static void adapter_set_name(const uint8_t *name)
+{
+ if (!g_strcmp0(adapter->name, (const char *) name))
+ return;
+
+ DBG("Cnage name: %s -> %s", adapter->name, name);
+
+ g_free(adapter->name);
+ adapter->name = g_strdup((const char *) name);
+}
+
static void mgmt_local_name_changed_event(uint16_t index, uint16_t length,
const void *param, void *user_data)
{
@@ -98,13 +109,7 @@ static void mgmt_local_name_changed_event(uint16_t index, uint16_t length,
return;
}
- if (!g_strcmp0(adapter->name, (const char *) rp->name))
- return;
-
- DBG("name: %s", rp->name);
-
- g_free(adapter->name);
- adapter->name = g_strdup((const char *) rp->name);
+ adapter_set_name(rp->name);
adapter_name_changed(rp->name);
}
@@ -879,6 +884,8 @@ static void set_adapter_name_complete(uint8_t status, uint16_t length,
return;
}
+ adapter_set_name(rp->name);
+
adapter_name_changed(rp->name);
}
--
1.7.10.4
next prev parent reply other threads:[~2013-11-05 10:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-05 8:53 [PATCH] android/daemon: Send update name notification on mgmt evt Andrei Emeltchenko
2013-11-05 9:05 ` Luiz Augusto von Dentz
2013-11-05 10:08 ` Andrei Emeltchenko [this message]
2013-11-05 10:33 ` [PATCH] android/daemon: Save adapter name on complete event Johan Hedberg
2013-11-05 12:28 ` Marcel Holtmann
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=1383646128-8077-1-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/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