2:49 a.m.
This patch will start providing an HSP profile implementation
in oFono. This is work in progress, and based of what was done for
HFP profile.
Next step is to add an audio connection it will be done in a separate
patch since it must be discussed.
Frédéric Dalleau (5):
hsp_ag: Initial plugin commit
hsp_ag: add modem watch
hsp_ag: add hsp emulator type
hsp_ag: add hsp atom type
hsp_ag: change emulator type to hsp
Makefile.am | 3 +
include/emulator.h | 1 +
plugins/hsp_ag.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/emulator.c | 4 +
src/ofono.h | 1 +
5 files changed, 208 insertions(+), 0 deletions(-)
create mode 100644 plugins/hsp_ag.c
2:49 a.m.
New subject: [PATCH 1/5] hsp_ag: Initial plugin commit
---
Makefile.am | 3 +
plugins/hsp_ag.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 118 insertions(+), 0 deletions(-)
create mode 100644 plugins/hsp_ag.c
diff --git a/Makefile.am b/Makefile.am
index a784636..d62224d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -335,6 +335,9 @@ builtin_sources += plugins/hfp_ag.c plugins/bluetooth.h
builtin_modules += dun_gw
builtin_sources += plugins/dun_gw.c plugins/bluetooth.h
+builtin_modules += hsp_ag
+builtin_sources += plugins/hsp_ag.c plugins/bluetooth.h
+
builtin_sources += $(btio_sources)
builtin_cflags += @BLUEZ_CFLAGS@
builtin_libadd += @BLUEZ_LIBS@
diff --git a/plugins/hsp_ag.c b/plugins/hsp_ag.c
new file mode 100644
index 0000000..34bf0a1
--- /dev/null
+++ b/plugins/hsp_ag.c
@@ -0,0 +1,115 @@
+/*
+ *
+ * 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 <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <glib.h>
+#include <gatchat.h>
+#include <gattty.h>
+#include <gdbus.h>
+#include <ofono.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/netreg.h>
+#include <ofono/voicecall.h>
+#include <ofono/call-volume.h>
+
+#include <ofono/dbus.h>
+
+#include "bluetooth.h"
+
+#define HSP_RFCOMM_CHAN 17
+
+static struct server *hsp;
+
+static const gchar *hsp_record =
+"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+"<record>\n"
+" <attribute id=\"0x0000\">\n"
+" <uint32 value=\"0x00010006\" />\n"
+" </attribute>\n"
+" <attribute id=\"0x0001\">\n"
+" <sequence>\n"
+" <uuid value=\"0x1112\" />\n"
+" <uuid value=\"0x1203\" />\n"
+" </sequence>\n"
+" </attribute>\n"
+" <attribute id=\"0x0004\">\n"
+" <sequence>\n"
+" <sequence>\n"
+" <uuid value=\"0x0100\" />\n"
+" </sequence>\n"
+" <sequence>\n"
+" <uuid value=\"0x0003\" />\n"
+" <uint8 value=\"17\" name=\"channel\" />\n"
+" </sequence>\n"
+" </sequence>\n"
+" </attribute>\n"
+" <attribute id=\"0x0005\">\n"
+" <sequence>\n"
+" <uuid value=\"0x1002\" />\n"
+" </sequence>\n"
+" </attribute>\n"
+" <attribute id=\"0x0009\">\n"
+" <sequence>\n"
+" <sequence>\n"
+" <uuid value=\"0x1108\" />\n"
+" <uint16 value=\"0x0102\" />\n"
+" </sequence>\n"
+" </sequence>\n"
+" </attribute>\n"
+" <attribute id=\"0x0100\">\n"
+" <text value=\"Headset Audio Gateway\" />\n"
+" </attribute>\n"
+"</record>\n";
+
+static void connect_cb(GIOChannel *channel, GError *err, gpointer user_data)
+{
+}
+
+static int hsp_ag_init(void)
+{
+ hsp = bluetooth_register_server(HSP_RFCOMM_CHAN, hsp_record, connect_cb, NULL);
+
+ if(!hsp)
+ return -1;
+
+ DBG("HSP Gateway profile starting");
+ return 0;
+}
+
+static void hsp_ag_exit(void)
+{
+ if(hsp)
+ bluetooth_unregister_server(hsp);
+}
+
+OFONO_PLUGIN_DEFINE(hsp_ag, "Headset Gateway Profile", VERSION,
+ OFONO_PLUGIN_PRIORITY_DEFAULT, hsp_ag_init, hsp_ag_exit)
--
1.7.1
2:49 a.m.
New subject: [PATCH 2/5] hsp_ag: add modem watch
---
plugins/hsp_ag.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/plugins/hsp_ag.c b/plugins/hsp_ag.c
index 34bf0a1..467b6b2 100644
--- a/plugins/hsp_ag.c
+++ b/plugins/hsp_ag.c
@@ -48,6 +48,8 @@
#define HSP_RFCOMM_CHAN 17
static struct server *hsp;
+static unsigned int modemwatch_id;
+static GList *modems;
static const gchar *hsp_record =
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
@@ -90,16 +92,95 @@ static const gchar *hsp_record =
" </attribute>\n"
"</record>\n";
-static void connect_cb(GIOChannel *channel, GError *err, gpointer user_data)
+static void connect_cb(GIOChannel *channel, GError *err, gpointer data)
{
+ int fd;
+ struct ofono_emulator *em;
+ struct ofono_modem *modem;
+
+ /* Pick the first powered modem */
+ modem = modems->data;
+ DBG("Picked modem %p for emulator", modem);
+
+ em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_DUN);
+ if (em == NULL)
+ return;
+
+ fd = g_io_channel_unix_get_fd(channel);
+
+ ofono_emulator_register(em, fd);
+
+ g_io_channel_set_close_on_unref(channel, FALSE);
+}
+
+static void create_server()
+{
+ if(hsp == NULL)
+ hsp = bluetooth_register_server(HSP_RFCOMM_CHAN, hsp_record,
+ connect_cb, NULL);
+
+ DBG("Creating server: %p", hsp);
+}
+
+static void destroy_server()
+{
+ DBG("Removing server: %p", hsp);
+
+ if(hsp)
+ bluetooth_unregister_server(hsp);
+ hsp = NULL;
+}
+
+static void powered_watch(struct ofono_modem *modem, gboolean powered,
+ void *user)
+{
+ if (powered == FALSE) {
+ DBG("Removing modem %p from the list", modem);
+ modems = g_list_remove(modems, modem);
+
+ if (modems == NULL) {
+ destroy_server();
+ }
+ } else {
+ DBG("Adding modem %p to the list", modem);
+ modems = g_list_append(modems, modem);
+
+ if (modems->next == NULL)
+ create_server();
+ }
+}
+
+static void modem_watch(struct ofono_modem *modem, gboolean added, void *user)
+{
+ DBG("modem: %p, added: %d", modem, added);
+
+ if (added == FALSE) {
+ DBG("Removing modem %p from the list", modem);
+ modems = g_list_remove(modems, modem);
+ return;
+ }
+
+ if (ofono_modem_get_powered(modem) == TRUE) {
+ DBG("Adding modem %p to the list", modem);
+ modems = g_list_append(modems, modem);
+
+ if (modems->next == NULL)
+ create_server();
+ }
+
+ __ofono_modem_add_powered_watch(modem, powered_watch, NULL, NULL);
+}
+
+static void call_modemwatch(struct ofono_modem *modem, void *user)
+{
+ modem_watch(modem, TRUE, user);
}
static int hsp_ag_init(void)
{
- hsp = bluetooth_register_server(HSP_RFCOMM_CHAN, hsp_record, connect_cb, NULL);
+ modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL);
- if(!hsp)
- return -1;
+ __ofono_modem_foreach(call_modemwatch, NULL);
DBG("HSP Gateway profile starting");
return 0;
@@ -107,8 +188,11 @@ static int hsp_ag_init(void)
static void hsp_ag_exit(void)
{
- if(hsp)
- bluetooth_unregister_server(hsp);
+ destroy_server();
+
+ __ofono_modemwatch_remove(modemwatch_id);
+
+ g_list_free(modems);
}
OFONO_PLUGIN_DEFINE(hsp_ag, "Headset Gateway Profile", VERSION,
--
1.7.1
2:49 a.m.
New subject: [PATCH 3/5] hsp_ag: add hsp emulator type
---
include/emulator.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/emulator.h b/include/emulator.h
index 71b7c24..e010606 100644
--- a/include/emulator.h
+++ b/include/emulator.h
@@ -42,6 +42,7 @@ struct ofono_emulator_request;
enum ofono_emulator_type {
OFONO_EMULATOR_TYPE_DUN,
OFONO_EMULATOR_TYPE_HFP,
+ OFONO_EMULATOR_TYPE_HSP,
};
enum ofono_emulator_request_type {
--
1.7.1
2:49 a.m.
New subject: [PATCH 4/5] hsp_ag: add hsp atom type
---
src/emulator.c | 4 ++++
src/ofono.h | 1 +
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/emulator.c b/src/emulator.c
index 20a575f..855235f 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -470,6 +470,8 @@ void ofono_emulator_register(struct ofono_emulator *em, int fd)
g_at_server_register(em->server, "D", dial_cb, em, NULL);
else if (em->type == OFONO_EMULATOR_TYPE_HFP)
g_at_server_set_echo(em->server, FALSE);
+ else if (em->type == OFONO_EMULATOR_TYPE_HSP)
+ g_at_server_set_echo(em->server, FALSE);
}
static void emulator_remove(struct ofono_atom *atom)
@@ -493,6 +495,8 @@ struct ofono_emulator *ofono_emulator_create(struct ofono_modem
*modem,
atom_t = OFONO_ATOM_TYPE_EMULATOR_DUN;
else if (type == OFONO_EMULATOR_TYPE_HFP)
atom_t = OFONO_ATOM_TYPE_EMULATOR_HFP;
+ else if (type == OFONO_EMULATOR_TYPE_HSP)
+ atom_t = OFONO_ATOM_TYPE_EMULATOR_HSP;
else
return NULL;
diff --git a/src/ofono.h b/src/ofono.h
index 1628df3..f294b87 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -130,6 +130,7 @@ enum ofono_atom_type {
OFONO_ATOM_TYPE_SIM_AUTH,
OFONO_ATOM_TYPE_EMULATOR_DUN,
OFONO_ATOM_TYPE_EMULATOR_HFP,
+ OFONO_ATOM_TYPE_EMULATOR_HSP,
OFONO_ATOM_TYPE_LOCATION_REPORTING,
};
--
1.7.1
2:49 a.m.
New subject: [PATCH 5/5] hsp_ag: change emulator type to hsp
---
plugins/hsp_ag.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/plugins/hsp_ag.c b/plugins/hsp_ag.c
index 467b6b2..4ace88e 100644
--- a/plugins/hsp_ag.c
+++ b/plugins/hsp_ag.c
@@ -102,7 +102,7 @@ static void connect_cb(GIOChannel *channel, GError *err, gpointer
data)
modem = modems->data;
DBG("Picked modem %p for emulator", modem);
- em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_DUN);
+ em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_HSP);
if (em == NULL)
return;
--
1.7.1
4206
days inactive
4206
days old
5 comments
1 participants
participants (1)
-
Frédéric Dalleau