Return-Path: From: To: CC: Subject: [PATCH v2 03/10] battery: Add GATT Battery Client Service skeleton Date: Thu, 13 Sep 2012 16:03:16 +0300 Message-ID: <1347541403-11780-4-git-send-email-chen.ganir@ti.com> In-Reply-To: <1347541403-11780-1-git-send-email-chen.ganir@ti.com> References: <1347541403-11780-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 the Battery Service Gatt Client side. Implement the basic skeleton. --- Makefile.am | 9 ++++- lib/uuid.h | 2 + profiles/battery/battery.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ profiles/battery/battery.h | 24 ++++++++++++ profiles/battery/main.c | 52 ++++++++++++++++++++++++++ profiles/battery/manager.c | 62 ++++++++++++++++++++++++++++++ profiles/battery/manager.h | 24 ++++++++++++ 7 files changed, 260 insertions(+), 2 deletions(-) create mode 100644 profiles/battery/battery.c create mode 100644 profiles/battery/battery.h create mode 100644 profiles/battery/main.c create mode 100644 profiles/battery/manager.c create mode 100644 profiles/battery/manager.h diff --git a/Makefile.am b/Makefile.am index 372111a..21b5ebf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -211,7 +211,7 @@ endif if GATTMODULES builtin_modules += thermometer alert time gatt_example proximity deviceinfo \ - gatt + gatt battery builtin_sources += profiles/thermometer/main.c \ profiles/thermometer/manager.h \ profiles/thermometer/manager.c \ @@ -240,7 +240,12 @@ builtin_sources += profiles/thermometer/main.c \ profiles/deviceinfo/deviceinfo.c \ profiles/gatt/main.c profiles/gatt/manager.h \ profiles/gatt/manager.c profiles/gatt/gas.h \ - profiles/gatt/gas.c + profiles/gatt/gas.c \ + profiles/battery/main.c \ + profiles/battery/manager.c \ + profiles/battery/manager.h \ + profiles/battery/battery.c \ + profiles/battery/battery.h endif builtin_modules += formfactor diff --git a/lib/uuid.h b/lib/uuid.h index aa6efdf..58ad0b3 100644 --- a/lib/uuid.h +++ b/lib/uuid.h @@ -56,6 +56,8 @@ extern "C" { #define PNPID_UUID "00002a50-0000-1000-8000-00805f9b34fb" #define DEVICE_INFORMATION_UUID "0000180a-0000-1000-8000-00805f9b34fb" +#define BATTERY_SERVICE_UUID "0000180f-0000-1000-8000-00805f9b34fb" + #define GATT_UUID "00001801-0000-1000-8000-00805f9b34fb" #define IMMEDIATE_ALERT_UUID "00001802-0000-1000-8000-00805f9b34fb" #define LINK_LOSS_UUID "00001803-0000-1000-8000-00805f9b34fb" diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c new file mode 100644 index 0000000..7702e39 --- /dev/null +++ b/profiles/battery/battery.c @@ -0,0 +1,89 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "adapter.h" +#include "device.h" +#include "att.h" +#include "gattrib.h" +#include "gatt.h" +#include "battery.h" + +struct battery { + struct btd_device *dev; /* Device reference */ +}; + +static GSList *servers; + +static gint cmp_device(gconstpointer a, gconstpointer b) +{ + const struct battery *batt = a; + const struct btd_device *dev = b; + + if (dev == batt->dev) + return 0; + + return -1; +} + +static void battery_free(gpointer user_data) +{ + struct battery *batt = user_data; + + btd_device_unref(batt->dev); + g_free(batt); +} + + +int battery_register(struct btd_device *device) +{ + struct battery *batt; + + batt = g_new0(struct battery, 1); + batt->dev = btd_device_ref(device); + + servers = g_slist_prepend(servers, batt); + + return 0; +} + +void battery_unregister(struct btd_device *device) +{ + struct battery *batt; + GSList *l; + + l = g_slist_find_custom(servers, device, cmp_device); + if (l == NULL) + return; + + batt = l->data; + servers = g_slist_remove(servers, batt); + + battery_free(batt); +} diff --git a/profiles/battery/battery.h b/profiles/battery/battery.h new file mode 100644 index 0000000..9933343 --- /dev/null +++ b/profiles/battery/battery.h @@ -0,0 +1,24 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +int battery_register(struct btd_device *device); +void battery_unregister(struct btd_device *device); diff --git a/profiles/battery/main.c b/profiles/battery/main.c new file mode 100644 index 0000000..d4a23c9 --- /dev/null +++ b/profiles/battery/main.c @@ -0,0 +1,52 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "hcid.h" +#include "plugin.h" +#include "manager.h" +#include "log.h" + +static int battery_init(void) +{ + if (!main_opts.gatt_enabled) { + error("GATT is disabled"); + return -ENOTSUP; + } + + return battery_manager_init(); +} + +static void battery_exit(void) +{ + battery_manager_exit(); +} + +BLUETOOTH_PLUGIN_DEFINE(battery, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, + battery_init, battery_exit) diff --git a/profiles/battery/manager.c b/profiles/battery/manager.c new file mode 100644 index 0000000..9abb31a --- /dev/null +++ b/profiles/battery/manager.c @@ -0,0 +1,62 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include +#include +#include +#include + +#include "adapter.h" +#include "device.h" +#include "profile.h" +#include "att.h" +#include "gattrib.h" +#include "gatt.h" +#include "battery.h" +#include "manager.h" + +static int battery_driver_probe(struct btd_device *device, GSList *uuids) +{ + return battery_register(device); +} + +static void battery_driver_remove(struct btd_device *device) +{ + battery_unregister(device); +} + +static struct btd_profile battery_profile = { + .name = "battery", + .remote_uuids = BTD_UUIDS(BATTERY_SERVICE_UUID), + .device_probe = battery_driver_probe, + .device_remove = battery_driver_remove +}; + +int battery_manager_init(void) +{ + return btd_profile_register(&battery_profile); +} + +void battery_manager_exit(void) +{ + btd_profile_unregister(&battery_profile); +} diff --git a/profiles/battery/manager.h b/profiles/battery/manager.h new file mode 100644 index 0000000..b2c849f --- /dev/null +++ b/profiles/battery/manager.h @@ -0,0 +1,24 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +int battery_manager_init(void); +void battery_manager_exit(void); -- 1.7.9.5