diff options
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 19 | ||||
| -rw-r--r-- | plugins/hal.c | 111 |
4 files changed, 141 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1991e4aa..02e456fa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -156,6 +156,12 @@ AC_DEFUN([AC_PATH_USB], [ [Define to 1 if you need the usb_interrupt_read() function.])) ]) +AC_DEFUN([AC_PATH_HAL], [ + PKG_CHECK_MODULES(HAL, hal, hal_found=yes, hal_found=no) + AC_SUBST(HAL_CFLAGS) + AC_SUBST(HAL_LIBS) +]) + AC_DEFUN([AC_PATH_NETLINK], [ PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no) AC_SUBST(NETLINK_CFLAGS) @@ -174,6 +180,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ pie_enable=yes sndfile_enable=${sndfile_found} netlink_enable=no + hal_enable=${hal_found} usb_enable=${usb_found} alsa_enable=${alsa_found} gstreamer_enable=${gstreamer_found} @@ -237,6 +244,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ usb_enable=${enableval} ]) + AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL support]), [ + hal_enable=${enableval} + ]) + AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [ netlink_enable=${enableval} ]) @@ -331,6 +342,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes") + AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes" && test "${hal_found}" = "yes") AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes") AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") diff --git a/configure.ac b/configure.ac index 30a256a4..a7e978b8 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ AC_PATH_GMODULE AC_PATH_ALSA AC_PATH_GSTREAMER AC_PATH_USB +AC_PATH_HAL AC_PATH_NETLINK AC_PATH_SNDFILE diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 8565bb29..e8b6ca0f 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,6 +1,12 @@ plugindir = $(libdir)/bluetooth/plugins +if HAL +hal_plugins = hal.la +else +hal_plugins = +endif + if NETLINK netlink_plugins = netlink.la else @@ -13,7 +19,7 @@ else service_plugins = endif -plugin_LTLIBRARIES = $(netlink_plugins) $(service_plugins) +plugin_LTLIBRARIES = $(hal_plugins) $(netlink_plugins) $(service_plugins) noinst_LTLIBRARIES = echo.la storage.la @@ -21,6 +27,12 @@ echo_la_SOURCES = echo.c storage_la_SOURCES = storage.c +if HAL +hal_la_SOURCES = hal.c + +hal_la_LIBADD = @HAL_LIBS@ +endif + if NETLINK netlink_la_SOURCES = netlink.c @@ -34,7 +46,8 @@ endif AM_LDFLAGS = -module -avoid-version -no-undefined \ -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \ + @NETLINK_CFLAGS@ @HAL_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src @@ -46,8 +59,10 @@ all-local: @$(LN_S) -f $(top_srcdir)/serial/.libs/serial.so @$(LN_S) -f $(top_srcdir)/network/.libs/network.so @$(LN_S) -f .libs/service.so + @$(LN_S) -f .libs/hal.so clean-local: + @rm -f hal.so @rm -f service.so @rm -f network.so @rm -f serial.so diff --git a/plugins/hal.c b/plugins/hal.c new file mode 100644 index 00000000..475d4956 --- /dev/null +++ b/plugins/hal.c @@ -0,0 +1,111 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2008 Marcel Holtmann <marcel@holtmann.org> + * + * + * 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 <config.h> +#endif + +#include <errno.h> +#include <unistd.h> +#include <stdlib.h> + +#include <hal/libhal.h> + +#include "plugin.h" +#include "adapter.h" +#include "logging.h" + +static uint32_t get_form_factor(LibHalContext *ctx) +{ + char *formfactor; + uint8_t minor = 0; + + formfactor = libhal_device_get_property_string(ctx, + "/org/freedesktop/Hal/devices/computer", + "system.formfactor", NULL); + + if (formfactor == NULL) + return (1 << 8); + + if (g_str_equal(formfactor, "laptop") == TRUE) + minor |= (1 << 2) | (1 << 3); + else if (g_str_equal(formfactor, "desktop") == TRUE) + minor |= 1 << 2; + else if (g_str_equal(formfactor, "server") == TRUE) + minor |= 1 << 3; + else if (g_str_equal(formfactor, "handheld") == TRUE) + minor += 1 << 4; + + free(formfactor); + + /* Computer major class */ + return (1 << 8) | minor; +} + +static int hal_probe(struct btd_adapter *adapter) +{ + DBusConnection *conn; + LibHalContext *ctx; + + conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + if (conn == NULL) + return -ENOMEM; + + ctx = libhal_ctx_new(); + if (libhal_ctx_set_dbus_connection(ctx, conn) == FALSE) { + libhal_ctx_free(ctx); + dbus_connection_unref(conn); + return -EIO; + } + + if (libhal_ctx_init(ctx, NULL) == FALSE) { + error("Unable to init HAL context"); + libhal_ctx_free(ctx); + dbus_connection_unref(conn); + return -EIO; + } + + debug("Setting 0x%06x device class", get_form_factor(ctx)); + + libhal_ctx_free(ctx); + dbus_connection_unref(conn); + + return -ENODEV; +} + +static struct btd_adapter_driver hal_driver = { + .name = "hal", + .probe = hal_probe, +}; + +static int hal_init(void) +{ + return btd_register_adapter_driver(&hal_driver); +} + +static void hal_exit(void) +{ + btd_unregister_adapter_driver(&hal_driver); +} + +BLUETOOTH_PLUGIN_DEFINE("hal", hal_init, hal_exit) |