From: Mikel Astiz Date: Fri, 26 Apr 2013 06:17:07 +0000 (+0200) Subject: core: Add btd_service to represent device services X-Git-Tag: android-x86-4.4-r3~8264 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b5c339804950551cba3bc07051dc339ad0a1db2c;p=android-x86%2Fexternal-bluetooth-bluez.git core: Add btd_service to represent device services Add a new object to centralize all data corresponding to a service provided by a remote device, coupling a pair of btd_profile and btd_device pointers. --- diff --git a/Makefile.am b/Makefile.am index 1d0dd1380..da87a2164 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,6 +142,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \ src/error.h src/error.c \ src/adapter.h src/adapter.c \ src/profile.h src/profile.c \ + src/service.h src/service.c \ src/device.h src/device.c src/attio.h \ src/dbus-common.c src/dbus-common.h \ src/eir.h src/eir.c \ diff --git a/src/service.c b/src/service.c new file mode 100644 index 000000000..4b69cba76 --- /dev/null +++ b/src/service.c @@ -0,0 +1,102 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012-2013 BMW Car IT GmbH. All rights reserved. + * + * + * 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 +#include +#include +#include +#include +#include + +#include + +#include + +#include "log.h" + +#include "adapter.h" +#include "device.h" +#include "profile.h" +#include "service.h" + +struct btd_service { + gint ref; + struct btd_device *device; + struct btd_profile *profile; +}; + +struct btd_service *btd_service_ref(struct btd_service *service) +{ + service->ref++; + + DBG("%p: ref=%d", service, service->ref); + + return service; +} + +void btd_service_unref(struct btd_service *service) +{ + service->ref--; + + DBG("%p: ref=%d", service, service->ref); + + if (service->ref > 0) + return; + + g_free(service); +} + +struct btd_service *service_create(struct btd_device *device, + struct btd_profile *profile) +{ + struct btd_service *service; + + service = g_try_new0(struct btd_service, 1); + if (!service) { + error("service_create: failed to alloc memory"); + return NULL; + } + + service->ref = 1; + service->device = device; /* Weak ref */ + service->profile = profile; + + return service; +} + +struct btd_device *btd_service_get_device(const struct btd_service *service) +{ + return service->device; +} + +struct btd_profile *btd_service_get_profile(const struct btd_service *service) +{ + return service->profile; +} diff --git a/src/service.h b/src/service.h new file mode 100644 index 000000000..4f8338796 --- /dev/null +++ b/src/service.h @@ -0,0 +1,37 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012-2013 BMW Car IT GmbH. All rights reserved. + * + * + * 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 + * + */ + +struct btd_service; +struct btd_device; +struct btd_profile; + +struct btd_service *btd_service_ref(struct btd_service *service); +void btd_service_unref(struct btd_service *service); + +/* Service management functions used by the core */ +struct btd_service *service_create(struct btd_device *device, + struct btd_profile *profile); + +/* Public member access */ +struct btd_device *btd_service_get_device(const struct btd_service *service); +struct btd_profile *btd_service_get_profile(const struct btd_service *service);