bluetooth: Rename HFP AG plugin

As BlueZ 5 introduced backwards incompatible API changes, and we want to
keep support for BlueZ 4 based HFP AG plugin for some time, we need to
separate HFP AG plugin which is based on BlueZ 4 from the one based on
BlueZ 5.

The hfp_ag.c plugin is renamed to hfp_ag_bluez4. This will make it easy
to add an HFP AG plugin for BlueZ 5.

diff --git a/Makefile.am b/Makefile.am
index f24cac7c1e50670fa9af6a6839d93d032403a767..ee6d24c0749c98adbaa4eca5a0ac1fc3c7bfa661 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -421,8 +421,8 @@ builtin_sources += plugins/sap.c plugins/bluez4.h
 builtin_modules += hfp_bluez4
 builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h
 
-builtin_modules += hfp_ag
-builtin_sources += plugins/hfp_ag.c plugins/bluez4.h
+builtin_modules += hfp_ag_bluez4
+builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h
 
 builtin_modules += dun_gw
 builtin_sources += plugins/dun_gw.c plugins/bluez4.h

diff --git a/plugins/hfp_ag.c b/plugins/hfp_ag.c
deleted file mode 100644 (file)
index 12374ad..0000000
--- a/plugins/hfp_ag.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2011  Intel Corporation. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  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 <string.h>
-#include <errno.h>
-#include <glib.h>
-#include <ofono.h>
-
-#define OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <gdbus.h>
-
-#include "bluez4.h"
-
-#define HFP_AG_CHANNEL 13
-
-static struct server *server;
-static guint modemwatch_id;
-static GList *modems;
-static GHashTable *sim_hash = NULL;
-
-static const gchar *hfp_ag_record =
-"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-"<record>\n"
-"  <attribute id=\"0x0001\">\n"
-"    <sequence>\n"
-"      <uuid value=\"0x111F\"/>\n"
-"      <uuid value=\"0x1203\"/>\n"
-"    </sequence>\n"
-"  </attribute>\n"
-"\n"
-"  <attribute id=\"0x0004\">\n"
-"    <sequence>\n"
-"      <sequence>\n"
-"        <uuid value=\"0x0100\"/>\n"
-"      </sequence>\n"
-"      <sequence>\n"
-"        <uuid value=\"0x0003\"/>\n"
-"        <uint8 value=\"13\" name=\"channel\"/>\n"
-"      </sequence>\n"
-"    </sequence>\n"
-"  </attribute>\n"
-"\n"
-"  <attribute id=\"0x0009\">\n"
-"    <sequence>\n"
-"      <sequence>\n"
-"        <uuid value=\"0x111E\"/>\n"
-"        <uint16 value=\"0x0105\" name=\"version\"/>\n"
-"      </sequence>\n"
-"    </sequence>\n"
-"  </attribute>\n"
-"\n"
-"  <attribute id=\"0x0100\">\n"
-"    <text value=\"Hands-Free Audio Gateway\" name=\"name\"/>\n"
-"  </attribute>\n"
-"\n"
-"  <attribute id=\"0x0301\">\n"
-"    <uint8 value=\"0x01\" />\n"
-"  </attribute>\n"
-"\n"
-"  <attribute id=\"0x0311\">\n"
-"    <uint16 value=\"0x0001\" />\n"
-"  </attribute>\n"
-"</record>\n";
-
-static void hfp_ag_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
-{
-       struct ofono_modem *modem;
-       struct ofono_emulator *em;
-       int fd;
-
-       DBG("");
-
-       if (err) {
-               DBG("%s", err->message);
-               return;
-       }
-
-       /* Pick the first voicecall capable modem */
-       modem = modems->data;
-       if (modem == NULL)
-               return;
-
-       DBG("Picked modem %p for emulator", modem);
-
-       em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_HFP);
-       if (em == NULL)
-               return;
-
-       fd = g_io_channel_unix_get_fd(io);
-       g_io_channel_set_close_on_unref(io, FALSE);
-
-       ofono_emulator_register(em, fd);
-}
-
-static void sim_state_watch(enum ofono_sim_state new_state, void *data)
-{
-       struct ofono_modem *modem = data;
-
-       if (new_state != OFONO_SIM_STATE_READY) {
-               modems = g_list_remove(modems, modem);
-               if (modems == NULL && server != NULL) {
-                       bluetooth_unregister_server(server);
-                       server = NULL;
-               }
-
-               return;
-       }
-
-       if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_VOICECALL) == NULL)
-               return;
-
-       modems = g_list_append(modems, modem);
-
-       if (modems->next != NULL)
-               return;
-
-       server = bluetooth_register_server(HFP_AG_CHANNEL, hfp_ag_record,
-                                               hfp_ag_connect_cb, NULL);
-}
-
-static gboolean sim_watch_remove(gpointer key, gpointer value,
-                               gpointer user_data)
-{
-       struct ofono_sim *sim = key;
-
-       ofono_sim_remove_state_watch(sim, GPOINTER_TO_UINT(value));
-
-       return TRUE;
-}
-
-static void sim_watch(struct ofono_atom *atom,
-                               enum ofono_atom_watch_condition cond,
-                               void *data)
-{
-       struct ofono_sim *sim = __ofono_atom_get_data(atom);
-       struct ofono_modem *modem = data;
-       int watch;
-
-       if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) {
-               sim_state_watch(OFONO_SIM_STATE_NOT_PRESENT, modem);
-
-               sim_watch_remove(sim, g_hash_table_lookup(sim_hash, sim), NULL);
-               g_hash_table_remove(sim_hash, sim);
-
-               return;
-       }
-
-       watch = ofono_sim_add_state_watch(sim, sim_state_watch, modem, NULL);
-       g_hash_table_insert(sim_hash, sim, GUINT_TO_POINTER(watch));
-       sim_state_watch(ofono_sim_get_state(sim), modem);
-}
-
-static void modem_watch(struct ofono_modem *modem, gboolean added, void *user)
-{
-       DBG("modem: %p, added: %d", modem, added);
-
-       if (added == FALSE)
-               return;
-
-       __ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_SIM,
-                                       sim_watch, modem, NULL);
-}
-
-static void call_modemwatch(struct ofono_modem *modem, void *user)
-{
-       modem_watch(modem, TRUE, user);
-}
-
-static int hfp_ag_init(void)
-{
-       sim_hash = g_hash_table_new(g_direct_hash, g_direct_equal);
-
-       modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL);
-       __ofono_modem_foreach(call_modemwatch, NULL);
-
-       return 0;
-}
-
-static void hfp_ag_exit(void)
-{
-       __ofono_modemwatch_remove(modemwatch_id);
-       g_list_free(modems);
-       g_hash_table_foreach_remove(sim_hash, sim_watch_remove, NULL);
-       g_hash_table_destroy(sim_hash);
-
-       if (server) {
-               bluetooth_unregister_server(server);
-               server = NULL;
-       }
-}
-
-OFONO_PLUGIN_DEFINE(hfp_ag, "Hands-Free Audio Gateway Profile Plugins", VERSION,
-                       OFONO_PLUGIN_PRIORITY_DEFAULT, hfp_ag_init, hfp_ag_exit)

diff --git a/plugins/hfp_ag_bluez4.c b/plugins/hfp_ag_bluez4.c
new file mode 100644 (file)
index 0000000..039b665
--- /dev/null
+++ b/plugins/hfp_ag_bluez4.c
@@ -0,0 +1,218 @@
+/*
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2011  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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 <string.h>
+#include <errno.h>
+#include <glib.h>
+#include <ofono.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <gdbus.h>
+
+#include "bluez4.h"
+
+#define HFP_AG_CHANNEL 13
+
+static struct server *server;
+static guint modemwatch_id;
+static GList *modems;
+static GHashTable *sim_hash = NULL;
+
+static const gchar *hfp_ag_record =
+"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+"<record>\n"
+"  <attribute id=\"0x0001\">\n"
+"    <sequence>\n"
+"      <uuid value=\"0x111F\"/>\n"
+"      <uuid value=\"0x1203\"/>\n"
+"    </sequence>\n"
+"  </attribute>\n"
+"\n"
+"  <attribute id=\"0x0004\">\n"
+"    <sequence>\n"
+"      <sequence>\n"
+"        <uuid value=\"0x0100\"/>\n"
+"      </sequence>\n"
+"      <sequence>\n"
+"        <uuid value=\"0x0003\"/>\n"
+"        <uint8 value=\"13\" name=\"channel\"/>\n"
+"      </sequence>\n"
+"    </sequence>\n"
+"  </attribute>\n"
+"\n"
+"  <attribute id=\"0x0009\">\n"
+"    <sequence>\n"
+"      <sequence>\n"
+"        <uuid value=\"0x111E\"/>\n"
+"        <uint16 value=\"0x0105\" name=\"version\"/>\n"
+"      </sequence>\n"
+"    </sequence>\n"
+"  </attribute>\n"
+"\n"
+"  <attribute id=\"0x0100\">\n"
+"    <text value=\"Hands-Free Audio Gateway\" name=\"name\"/>\n"
+"  </attribute>\n"
+"\n"
+"  <attribute id=\"0x0301\">\n"
+"    <uint8 value=\"0x01\" />\n"
+"  </attribute>\n"
+"\n"
+"  <attribute id=\"0x0311\">\n"
+"    <uint16 value=\"0x0001\" />\n"
+"  </attribute>\n"
+"</record>\n";
+
+static void hfp_ag_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
+{
+       struct ofono_modem *modem;
+       struct ofono_emulator *em;
+       int fd;
+
+       DBG("");
+
+       if (err) {
+               DBG("%s", err->message);
+               return;
+       }
+
+       /* Pick the first voicecall capable modem */
+       modem = modems->data;
+       if (modem == NULL)
+               return;
+
+       DBG("Picked modem %p for emulator", modem);
+
+       em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_HFP);
+       if (em == NULL)
+               return;
+
+       fd = g_io_channel_unix_get_fd(io);
+       g_io_channel_set_close_on_unref(io, FALSE);
+
+       ofono_emulator_register(em, fd);
+}
+
+static void sim_state_watch(enum ofono_sim_state new_state, void *data)
+{
+       struct ofono_modem *modem = data;
+
+       if (new_state != OFONO_SIM_STATE_READY) {
+               modems = g_list_remove(modems, modem);
+               if (modems == NULL && server != NULL) {
+                       bluetooth_unregister_server(server);
+                       server = NULL;
+               }
+
+               return;
+       }
+
+       if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_VOICECALL) == NULL)
+               return;
+
+       modems = g_list_append(modems, modem);
+
+       if (modems->next != NULL)
+               return;
+
+       server = bluetooth_register_server(HFP_AG_CHANNEL, hfp_ag_record,
+                                               hfp_ag_connect_cb, NULL);
+}
+
+static gboolean sim_watch_remove(gpointer key, gpointer value,
+                               gpointer user_data)
+{
+       struct ofono_sim *sim = key;
+
+       ofono_sim_remove_state_watch(sim, GPOINTER_TO_UINT(value));
+
+       return TRUE;
+}
+
+static void sim_watch(struct ofono_atom *atom,
+                               enum ofono_atom_watch_condition cond,
+                               void *data)
+{
+       struct ofono_sim *sim = __ofono_atom_get_data(atom);
+       struct ofono_modem *modem = data;
+       int watch;
+
+       if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED) {
+               sim_state_watch(OFONO_SIM_STATE_NOT_PRESENT, modem);
+
+               sim_watch_remove(sim, g_hash_table_lookup(sim_hash, sim), NULL);
+               g_hash_table_remove(sim_hash, sim);
+
+               return;
+       }
+
+       watch = ofono_sim_add_state_watch(sim, sim_state_watch, modem, NULL);
+       g_hash_table_insert(sim_hash, sim, GUINT_TO_POINTER(watch));
+       sim_state_watch(ofono_sim_get_state(sim), modem);
+}
+
+static void modem_watch(struct ofono_modem *modem, gboolean added, void *user)
+{
+       DBG("modem: %p, added: %d", modem, added);
+
+       if (added == FALSE)
+               return;
+
+       __ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_SIM,
+                                       sim_watch, modem, NULL);
+}
+
+static void call_modemwatch(struct ofono_modem *modem, void *user)
+{
+       modem_watch(modem, TRUE, user);
+}
+
+static int hfp_ag_init(void)
+{
+       sim_hash = g_hash_table_new(g_direct_hash, g_direct_equal);
+
+       modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL);
+       __ofono_modem_foreach(call_modemwatch, NULL);
+
+       return 0;
+}
+
+static void hfp_ag_exit(void)
+{
+       __ofono_modemwatch_remove(modemwatch_id);
+       g_list_free(modems);
+       g_hash_table_foreach_remove(sim_hash, sim_watch_remove, NULL);
+       g_hash_table_destroy(sim_hash);
+
+       if (server) {
+               bluetooth_unregister_server(server);
+               server = NULL;
+       }
+}
+
+OFONO_PLUGIN_DEFINE(hfp_ag_bluez4, "Hands-Free Audio Gateway Profile Plugins",
+                               VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT,
+                               hfp_ag_init, hfp_ag_exit)