Return-Path: From: To: CC: , Chen Ganir Subject: [PATCH v3 7/9] Battery: Read Battery level characteristic Date: Wed, 8 Aug 2012 17:26:18 +0300 Message-ID: <1344435980-9866-8-git-send-email-chen.ganir@ti.com> In-Reply-To: <1344435980-9866-1-git-send-email-chen.ganir@ti.com> References: <1344435980-9866-1-git-send-email-chen.ganir@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Chen Ganir Add support for reading the battery level characteristic on connection establishment. --- profiles/battery/battery.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c index 2f616e0..467922b 100644 --- a/profiles/battery/battery.c +++ b/profiles/battery/battery.c @@ -62,6 +62,7 @@ struct characteristic { GSList *desc; /* Descriptors */ uint8_t ns; /* Battery Namespace */ uint16_t description; /* Battery description */ + uint8_t level; }; struct descriptor { @@ -123,6 +124,40 @@ static void battery_free(gpointer user_data) g_free(batt); } +static void read_batterylevel_cb(guint8 status, const guint8 *pdu, guint16 len, + gpointer user_data) +{ + struct characteristic *ch = user_data; + uint8_t value[ATT_MAX_MTU]; + int vlen; + + if (status != 0) { + error("Failed to read Battery Level:%s", att_ecode2str(status)); + return; + } + + vlen = dec_read_resp(pdu, len, value, sizeof(value)); + if (!vlen) { + error("Failed to read Battery Level: Protocol error\n"); + return; + } + + if (vlen < 1) { + error("Failed to read Battery Level: Wrong pdu len"); + return; + } + + ch->level = value[0]; +} + +static void process_batteryservice_char(struct characteristic *ch) +{ + if (g_strcmp0(ch->attr.uuid, BATTERY_LEVEL_UUID) == 0) { + gatt_read_char(ch->batt->attrib, ch->attr.value_handle, 0, + read_batterylevel_cb, ch); + } +} + static void batterylevel_presentation_format_desc_cb(guint8 status, const guint8 *pdu, guint16 len, gpointer user_data) @@ -195,6 +230,8 @@ static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *msg, dict_append_entry(&dict, "Description", DBUS_TYPE_UINT16, &c->description); + dict_append_entry(&dict, "Level", DBUS_TYPE_BYTE, &c->level); + dbus_message_iter_close_container(&iter, &dict); return reply; @@ -260,6 +297,8 @@ update_char: } else { device_add_battery(ch->batt->dev, ch->path); } + + process_batteryservice_char(ch); } static void configure_battery_cb(GSList *characteristics, guint8 status, @@ -319,6 +358,12 @@ static void attio_connected_cb(GAttrib *attrib, gpointer user_data) gatt_discover_char(batt->attrib, batt->svc_range->start, batt->svc_range->end, NULL, configure_battery_cb, batt); + } else { + GSList *l; + for (l = batt->chars; l; l = l->next) { + struct characteristic *c = l->data; + process_batteryservice_char(c); + } } } -- 1.7.9.5