diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/Makefile.am | 2 | ||||
| -rw-r--r-- | network/hal.c | 86 | ||||
| -rw-r--r-- | network/hal.h | 27 |
3 files changed, 1 insertions, 114 deletions
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@ diff --git a/network/hal.c b/network/hal.c deleted file mode 100644 index a99dcd9e..00000000 --- a/network/hal.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2004-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 <stdio.h> -#include <errno.h> - -#include <dbus/dbus.h> -#include <hal/libhal.h> - -#include "logging.h" -#include "dbus.h" - -#include "hal.h" - -static LibHalContext *hal_ctx = NULL; - -int hal_init(DBusConnection *conn) -{ - char str[64], *udi; - - hal_ctx = libhal_ctx_new(); - if (!hal_ctx) - return -ENOMEM; - - conn = init_dbus(NULL, NULL, NULL); - - if (libhal_ctx_set_dbus_connection(hal_ctx, conn) == FALSE) { - error("Failed to connect HAL via system bus"); - libhal_ctx_free(hal_ctx); - hal_ctx = NULL; - return -EIO; - } - - if (libhal_ctx_init(hal_ctx, NULL) == FALSE) { - error("Unable to init HAL context"); - libhal_ctx_free(hal_ctx); - hal_ctx = NULL; - return -EIO; - } - - udi = libhal_new_device(hal_ctx, NULL); - - sprintf(str, "/org/freedesktop/Hal/devices/bluetooth_pan"); - - if (libhal_device_commit_to_gdl(hal_ctx, udi, str, NULL) == FALSE) { - error("Failed to add new HAL device"); - } - - return 0; -} - -void hal_cleanup(void) -{ - if (!hal_ctx) - return; - - libhal_ctx_shutdown(hal_ctx, NULL); - - libhal_ctx_free(hal_ctx); - - hal_ctx = NULL; -} diff --git a/network/hal.h b/network/hal.h deleted file mode 100644 index f664e143..00000000 --- a/network/hal.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2004-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 - * - */ - -#include <dbus/dbus.h> - -int hal_init(DBusConnection *conn); -void hal_cleanup(void); |