Create a common HAL abstraction layer

4 files changed, 162 insertions, 2 deletions

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/common/hal-libhal.c b/common/hal-libhal.c
new file mode 100644
index 00000000..d3fe9717
--- /dev/null
+++ b/common/hal-libhal.c
@@ -0,0 +1,90 @@
+/*
+ *
+ *  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 <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);
+
+	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) {
+		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/common/hal.h b/common/hal.h
new file mode 100644
index 00000000..5ff86a8a
--- /dev/null
+++ b/common/hal.h
@@ -0,0 +1,27 @@
+/*
+ *
+ *  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
+ *
+ */
+
+#include <dbus/dbus.h>
+
+int hal_init(DBusConnection *conn);
+void hal_cleanup(void);