This patch declares the external HFP Profile handler. It contains the
initial implementation of the D-Bus Profile1 interface and methods
responsible for handling Bluetooth connections.
---
plugins/bluetooth.h | 1 +
plugins/hfp_hf.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h
index ffaf9e3..96f3a53 100644
--- a/plugins/bluetooth.h
+++ b/plugins/bluetooth.h
@@ -25,6 +25,7 @@
#define BLUEZ_SERVICE "org.bluez"
#define BLUEZ_MANAGER_INTERFACE BLUEZ_SERVICE ".Manager"
#define BLUEZ_PROFILE_MGMT_INTERFACE BLUEZ_SERVICE ".ProfileManager1"
+#define BLUEZ_PROFILE_INTERFACE BLUEZ_SERVICE ".Profile1"
#define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter"
#define BLUEZ_DEVICE_INTERFACE BLUEZ_SERVICE ".Device"
#define BLUEZ_SERVICE_INTERFACE BLUEZ_SERVICE ".Service"
diff --git a/plugins/hfp_hf.c b/plugins/hfp_hf.c
index 1e0064c..405ada2 100644
--- a/plugins/hfp_hf.c
+++ b/plugins/hfp_hf.c
@@ -339,6 +339,47 @@ static int hfp_unregister_ofono_handsfree(struct
ofono_modem *modem)
return 0;
}
+static DBusMessage *profile_new_connection(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ DBG("Profile handler NewConnection");
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *profile_release(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ DBG("Profile handler Release");
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *profile_cancel(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ DBG("Profile handler Cancel");
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *profile_disconnection(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ DBG("Profile handler RequestDisconnection");
+ return dbus_message_new_method_return(msg);
+}
+
+static const GDBusMethodTable profile_methods[] = {
+ { GDBUS_ASYNC_METHOD("NewConnection",
+ GDBUS_ARGS({ "device", "o"}, { "fd", "h"},
+ { "fd_properties", "a{sv}" }),
+ NULL, profile_new_connection) },
+ { GDBUS_METHOD("Release", NULL, NULL, profile_release) },
+ { GDBUS_METHOD("Cancel", NULL, NULL, profile_cancel) },
+ { GDBUS_METHOD("RequestDisconnection",
+ GDBUS_ARGS({"o"}), NULL,
+ profile_disconnection) },
+ { }
+};
+
static int hfp_probe(struct ofono_modem *modem)
{
const char *obj_path = ofono_modem_get_path(modem);
@@ -526,12 +567,24 @@ static int hfp_init(void)
connection = ofono_dbus_get_connection();
+ /* Registers External Profile handler */
+ if (!g_dbus_register_interface(connection, HFP_EXT_PROFILE_PATH,
+ BLUEZ_PROFILE_INTERFACE,
+ profile_methods, NULL,
+ NULL, NULL, NULL)) {
+ ofono_error("Register Profile interface failed: %s",
+ HFP_EXT_PROFILE_PATH);
+ return -EIO;
+ }
+
err = ofono_modem_driver_register(&hfp_driver);
if (err < 0)
return err;
err = bluetooth_register_uuid(HFP_AG_UUID, &hfp_hf);
if (err < 0) {
+ g_dbus_unregister_interface(connection, HFP_EXT_PROFILE_PATH,
+ BLUEZ_PROFILE_INTERFACE);
ofono_modem_driver_unregister(&hfp_driver);
return err;
}
@@ -539,6 +592,8 @@ static int hfp_init(void)
err = bluetooth_register_profile(HFP_HS_UUID, "hfp_hf",
HFP_EXT_PROFILE_PATH);
if (err < 0) {
+ g_dbus_unregister_interface(connection, HFP_EXT_PROFILE_PATH,
+ BLUEZ_PROFILE_INTERFACE);
bluetooth_unregister_uuid(HFP_AG_UUID);
ofono_modem_driver_unregister(&hfp_driver);
return err;
@@ -552,7 +607,8 @@ static int hfp_init(void)
static void hfp_exit(void)
{
-
+ g_dbus_unregister_interface(connection, HFP_EXT_PROFILE_PATH,
+ BLUEZ_PROFILE_INTERFACE);
bluetooth_unregister_profile(HFP_EXT_PROFILE_PATH);
bluetooth_unregister_uuid(HFP_AG_UUID);
ofono_modem_driver_unregister(&hfp_driver);
--
1.7.11.7
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
