From: Anderson Lizardo <anderson.lizardo@openbossa.org>
To: linux-bluetooth@vger.kernel.org
Cc: Claudio Takahasi <claudio.takahasi@openbossa.org>
Subject: [PATCH v2 BlueZ 2/8] attrib: Discover Characteristics if already connected
Date: Tue, 27 Mar 2012 16:43:43 -0400 [thread overview]
Message-ID: <1332881029-1732-3-git-send-email-anderson.lizardo@openbossa.org> (raw)
In-Reply-To: <1332881029-1732-1-git-send-email-anderson.lizardo@openbossa.org>
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
On Generic Attribute, Discover All Characteristics of a Service can be
started immediately if already connected, without registering a ATTIO
connection callback.
---
attrib/client.c | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/attrib/client.c b/attrib/client.c
index 143c06b..2ad3956 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -325,6 +325,9 @@ static void offline_char_write(gpointer data, gpointer user_data)
offline_char_written, chr);
}
+static void char_discovered_cb(GSList *characteristics, guint8 status,
+ gpointer user_data);
+
static void attio_connected(GAttrib *attrib, gpointer user_data)
{
struct gatt_service *gatt = user_data;
@@ -337,6 +340,16 @@ static void attio_connected(GAttrib *attrib, gpointer user_data)
events_handler, gatt, NULL);
g_slist_foreach(gatt->offline_chars, offline_char_write, attrib);
+
+ if (gatt->query) {
+ struct gatt_primary *prim = gatt->prim;
+ struct query_data *qchr;
+
+ qchr = g_slist_nth_data(gatt->query->list, 0);
+ gatt_discover_char(gatt->attrib, prim->range.start,
+ prim->range.end, NULL,
+ char_discovered_cb, qchr);
+ }
}
static void attio_disconnected(gpointer user_data)
@@ -899,27 +912,6 @@ fail:
g_free(current);
}
-static void send_discover(GAttrib *attrib, gpointer user_data)
-{
- struct query_data *qchr = user_data;
- struct gatt_service *gatt = qchr->gatt;
- struct gatt_primary *prim = gatt->prim;
-
- gatt->attrib = g_attrib_ref(attrib);
-
- gatt_discover_char(gatt->attrib, prim->range.start, prim->range.end, NULL,
- char_discovered_cb, qchr);
-}
-
-static void cancel_discover(gpointer user_data)
-{
- struct query_data *qchr = user_data;
- struct gatt_service *gatt = qchr->gatt;
-
- g_attrib_unref(gatt->attrib);
- gatt->attrib = NULL;
-}
-
static DBusMessage *discover_char(DBusConnection *conn, DBusMessage *msg,
void *data)
{
@@ -937,10 +929,17 @@ static DBusMessage *discover_char(DBusConnection *conn, DBusMessage *msg,
query->msg = dbus_message_ref(msg);
- gatt->attioid = btd_device_add_attio_callback(gatt->dev,
- send_discover,
- cancel_discover,
- qchr);
+ if (gatt->attioid == 0) {
+ gatt->attioid = btd_device_add_attio_callback(gatt->dev,
+ attio_connected,
+ attio_disconnected,
+ gatt);
+ } else if (gatt->attrib) {
+ struct gatt_primary *prim = gatt->prim;
+ gatt_discover_char(gatt->attrib, prim->range.start,
+ prim->range.end, NULL,
+ char_discovered_cb, qchr);
+ }
gatt->query = query;
--
1.7.5.4
next prev parent reply other threads:[~2012-03-27 20:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 17:00 [PATCH BlueZ 0/8] Generic GATT client fixes Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 1/8] attrib: Centralize ATTIO connection management Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 2/8] attrib: Discover Characteristics if already connected Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 3/8] attrib: Move Characteristic Discovery reply to a new function Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 4/8] attrib: Register only new characteristics found Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 5/8] attrib: Fix missing Discovery reply when disconnected Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 6/8] attrib: Fix missing D-Bus message unref on DiscoverCharacteristics Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 7/8] attrib: Attempt to remove attio callback on watcher exit Anderson Lizardo
2012-03-21 17:00 ` [PATCH BlueZ 8/8] gattrib: Protect GAttrib when there is a pending write Anderson Lizardo
2012-03-27 20:43 ` [PATCH v2 BlueZ 0/8] Generic GATT client fixes Anderson Lizardo
2012-03-27 20:43 ` [PATCH v2 BlueZ 1/8] attrib: Centralize ATTIO connection management Anderson Lizardo
2012-03-27 20:43 ` Anderson Lizardo [this message]
2012-03-27 20:43 ` [PATCH v2 BlueZ 3/8] attrib: Move Characteristic Discovery reply to a new function Anderson Lizardo
2012-03-27 20:43 ` [PATCH v2 BlueZ 4/8] attrib: Register only new characteristics found Anderson Lizardo
2012-03-27 20:43 ` [PATCH v2 BlueZ 5/8] attrib: Fix missing Discovery reply when disconnected Anderson Lizardo
2012-03-30 10:23 ` Johan Hedberg
2012-03-27 20:43 ` [PATCH v2 BlueZ 6/8] attrib: Fix missing D-Bus message unref on DiscoverCharacteristics Anderson Lizardo
2012-03-27 20:43 ` [PATCH v2 BlueZ 7/8] attrib: Attempt to remove attio callback on watcher exit Anderson Lizardo
2012-03-27 20:43 ` [PATCH v2 BlueZ 8/8] gattrib: Protect GAttrib when there is a pending write Anderson Lizardo
2012-03-30 10:25 ` Johan Hedberg
2012-04-02 13:56 ` Anderson Lizardo
2012-04-02 13:56 ` [PATCH v3 BlueZ 0/2] Generic GATT client fixes Anderson Lizardo
2012-04-02 13:56 ` [PATCH v3 BlueZ 1/2] attrib: Fix missing Discovery reply when disconnected Anderson Lizardo
2012-04-02 13:56 ` [PATCH v3 BlueZ 2/2] gattrib: Protect GAttrib when there is a pending write Anderson Lizardo
2012-04-03 11:19 ` [PATCH v3 BlueZ 0/2] Generic GATT client fixes Johan Hedberg
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=1332881029-1732-3-git-send-email-anderson.lizardo@openbossa.org \
--to=anderson.lizardo@openbossa.org \
--cc=claudio.takahasi@openbossa.org \
--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;
as well as URLs for NNTP newsgroup(s).