diff options
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | common/Makefile.am | 10 | ||||
| -rw-r--r-- | common/hal-dummy.c | 37 | ||||
| -rw-r--r-- | common/hal-libhal.c (renamed from network/hal.c) | 6 | ||||
| -rw-r--r-- | common/hal.h (renamed from network/hal.h) | 2 | ||||
| -rw-r--r-- | network/Makefile.am | 2 |
6 files changed, 58 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2eac9315..cdc2a047 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -153,6 +153,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ pie_enable=no inotify_enable=${inotify_found} expat_enable=${expat_found} + hal_enable=${hal_found} usb_enable=${usb_found} glib_enable=no obex_enable=${openobex_found} @@ -214,6 +215,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ expat_enable=${enableval} ]) + AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL support]), [ + hal_enable=${enableval} + ]) + AC_ARG_ENABLE(usb, AC_HELP_STRING([--enable-usb], [enable USB support]), [ usb_enable=${enableval} ]) @@ -326,6 +331,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) AM_CONDITIONAL(INOTIFY, test "${inotify_enable}" = "yes" && test "${inotify_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(OBEX, test "${obex_enable}" = "yes" && test "${openobex_found}" = "yes") AM_CONDITIONAL(NETWORKSERVICE, test "${network_enable}" = "yes") diff --git a/common/Makefile.am b/common/Makefile.am index 77a77322..a2e50354 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -9,6 +9,12 @@ sdp_sources = sdp-dummy.c endif endif +if HAL +hal_sources = hal-libhal.c +else +hal_sources = hal-dummy.c +endif + if INOTIFY notify_sources = notify-inotify.c else @@ -21,7 +27,7 @@ libhelper_a_SOURCES = oui.h oui.c dbus.h dbus.c \ textfile.h textfile.c logging.h logging.c \ dbus-helper.h dbus-helper.c \ sdp-xml.h sdp-xml.c $(sdp_sources) \ - notify.h $(notify_sources) + hal.h $(hal_sources) notify.h $(notify_sources) noinst_PROGRAMS = test_textfile @@ -29,7 +35,7 @@ test_textfile_LDADD = libhelper.a AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ -EXTRA_DIST = ppoll.h uinput.h \ +EXTRA_DIST = ppoll.h uinput.h hal-dummy.c hal-libhal.c \ notify-dummy.c notify-inotify.c \ sdp-dummy.c sdp-expat.c sdp-glib.c diff --git a/common/hal-dummy.c b/common/hal-dummy.c new file mode 100644 index 00000000..e16a6b67 --- /dev/null +++ b/common/hal-dummy.c @@ -0,0 +1,37 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2006-2007 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 "hal.h" + +int hal_init(DBusConnection *conn) +{ + return 0; +} + +void hal_cleanup(void) +{ +} diff --git a/network/hal.c b/common/hal-libhal.c index a99dcd9e..d3fe9717 100644 --- a/network/hal.c +++ b/common/hal-libhal.c @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2006-2007 Marcel Holtmann <marcel@holtmann.org> * * * This program is free software; you can redistribute it and/or modify @@ -64,6 +64,10 @@ int hal_init(DBusConnection *conn) udi = libhal_new_device(hal_ctx, NULL); + if (libhal_device_add_capability(hal_ctx, udi, "net", NULL) == FALSE) { + error("Failed to add device capability"); + } + sprintf(str, "/org/freedesktop/Hal/devices/bluetooth_pan"); if (libhal_device_commit_to_gdl(hal_ctx, udi, str, NULL) == FALSE) { diff --git a/network/hal.h b/common/hal.h index f664e143..5ff86a8a 100644 --- a/network/hal.h +++ b/common/hal.h @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2006-2007 Marcel Holtmann <marcel@holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff --git a/network/Makefile.am b/network/Makefile.am index 686fad9a..65dfde44 100644 --- a/network/Makefile.am +++ b/network/Makefile.am @@ -13,7 +13,7 @@ noinst_PROGRAMS = bluetoothd-service-network bluetoothd_service_network_SOURCES = main.c \ manager.h manager.c error.h error.c \ server.h server.c bridge.h bridge.c \ - hal.h hal.c connection.h connection.c + connection.h connection.c LDADD = $(top_builddir)/common/libhelper.a \ @GLIB_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ |