5:03 a.m.
Hi,
Sending this as an RFC as this depends on an socket API that is still
being discussed[1]. If the current proposed API (SCO_SETTINGS) is
approved, this series can be promoted to 'PATCH'.
If we want to send mSBC data over SCO, we need to enable the
transparent mode in the SCO link, the only way to inform that to the
kernel is using the SCO_SETTINGS (or similar) socket option.
Cheers,
[1] http://thread.gmane.org/gmane.linux.bluez.kernel/34902
Claudio Takahasi (2):
bluetooth: Add define for SCO voice settings
handsfree-audio: Add setting SCO air mode
src/bluetooth.h | 11 +++++++++++
src/handsfree-audio.c | 19 +++++++++++++++++++
2 files changed, 30 insertions(+)
--
1.8.2.1
5:03 a.m.
New subject: [RFC 1/2] bluetooth: Add define for SCO voice settings
From: Claudio Takahasi <claudio.takahasi(a)openbossa.org>
Add defines for SCO voice setting (Air Coding). Air mode "Transparent
Data" shall be supported if wide band speech is supported.
---
src/bluetooth.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/bluetooth.h b/src/bluetooth.h
index af6f02c..4421b59 100644
--- a/src/bluetooth.h
+++ b/src/bluetooth.h
@@ -54,6 +54,17 @@ struct sockaddr_sco {
bdaddr_t sco_bdaddr;
};
+/* SCO socket settings */
+#define SCO_SETTINGS 0x03
+
+struct sco_settings {
+ uint16_t settings;
+};
+
+/* From Core 4.0 spec, Volume 2, Part E. Section 6.12, page 685 */
+#define SCO_SETTING_CVSD 0x0000
+#define SCO_SETTING_TRANSPARENT 0x0003
+
static inline void bt_bacpy(bdaddr_t *dst, const bdaddr_t *src)
{
memcpy(dst, src, sizeof(bdaddr_t));
--
1.8.2.1
5:03 a.m.
New subject: [RFC 2/2] handsfree-audio: Add setting SCO air mode
From: Claudio Takahasi <claudio.takahasi(a)openbossa.org>
---
src/handsfree-audio.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/src/handsfree-audio.c b/src/handsfree-audio.c
index c24e787..a7da523 100644
--- a/src/handsfree-audio.c
+++ b/src/handsfree-audio.c
@@ -68,6 +68,16 @@ static GSList *drivers = 0;
static ofono_bool_t has_wideband = FALSE;
static int defer_setup = 1;
+static uint16_t codec2setting(uint8_t codec)
+{
+ switch (codec) {
+ case HFP_CODEC_CVSD:
+ return SCO_SETTING_CVSD;
+ default:
+ return SCO_SETTING_TRANSPARENT;
+ }
+}
+
static void send_new_connection(const char *card, int fd, uint8_t codec)
{
DBusMessage *msg;
@@ -107,6 +117,7 @@ static gboolean sco_accept(GIOChannel *io, GIOCondition cond,
{
struct ofono_handsfree_card *card;
struct sockaddr_sco saddr;
+ struct sco_settings options;
socklen_t alen;
int sk, nsk;
char local[18], remote[18];
@@ -150,6 +161,14 @@ static gboolean sco_accept(GIOChannel *io, GIOCondition cond,
return TRUE;
}
+ memset(&options, 0, sizeof(options));
+ options.settings = codec2setting(card->selected_codec);
+
+ if (setsockopt(nsk, SOL_SCO, SCO_SETTINGS, &options,
+ sizeof(options)) < 0)
+ ofono_error("Can't set SCO options: %s (%d)", strerror(errno),
+ errno);
+
send_new_connection(card->path, nsk, card->selected_codec);
close(nsk);
--
1.8.2.1
3443
days inactive
3443
days old
2 comments
1 participants
participants (1)
-
Vinicius Costa Gomes