From: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>,
"Johan Hedberg" <johan.hedberg@intel.com>
Subject: [PATCH v10 05/10] Bluetooth: Use voice setting in deferred SCO connection request
Date: Wed, 14 Aug 2013 19:03:29 +0200 [thread overview]
Message-ID: <1376499814-11386-6-git-send-email-frederic.dalleau@linux.intel.com> (raw)
In-Reply-To: <1376499814-11386-1-git-send-email-frederic.dalleau@linux.intel.com>
When an incoming eSCO connection is requested, check the selected voice
setting and reply appropriately. Voice setting should have been
negotiated previously. For example, in case of HFP, the codec is
negotiated using AT commands on the RFCOMM channel. This patch only
changes replies for socket with deferred setup enabled.
Signed-off-by: Frédéric Dalleau <frederic.dalleau@linux.intel.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/sco.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index e8cda67..3b3d24a 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -653,7 +653,7 @@ static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
return err;
}
-static void sco_conn_defer_accept(struct hci_conn *conn)
+static void sco_conn_defer_accept(struct hci_conn *conn, u16 setting)
{
struct hci_dev *hdev = conn->hdev;
@@ -676,9 +676,21 @@ static void sco_conn_defer_accept(struct hci_conn *conn)
cp.tx_bandwidth = __constant_cpu_to_le32(0x00001f40);
cp.rx_bandwidth = __constant_cpu_to_le32(0x00001f40);
- cp.max_latency = __constant_cpu_to_le16(0xffff);
- cp.content_format = cpu_to_le16(hdev->voice_setting);
- cp.retrans_effort = 0xff;
+ cp.content_format = cpu_to_le16(setting);
+
+ switch (setting & SCO_AIRMODE_MASK) {
+ case SCO_AIRMODE_TRANSP:
+ if (conn->pkt_type & ESCO_2EV3)
+ cp.max_latency = __constant_cpu_to_le16(0x0008);
+ else
+ cp.max_latency = __constant_cpu_to_le16(0x000D);
+ cp.retrans_effort = 0x02;
+ break;
+ case SCO_AIRMODE_CVSD:
+ cp.max_latency = __constant_cpu_to_le16(0xffff);
+ cp.retrans_effort = 0xff;
+ break;
+ }
hci_send_cmd(hdev, HCI_OP_ACCEPT_SYNC_CONN_REQ,
sizeof(cp), &cp);
@@ -695,7 +707,7 @@ static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
if (sk->sk_state == BT_CONNECT2 &&
test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {
- sco_conn_defer_accept(pi->conn->hcon);
+ sco_conn_defer_accept(pi->conn->hcon, pi->setting);
sk->sk_state = BT_CONFIG;
msg->msg_namelen = 0;
--
1.7.9.5
next prev parent reply other threads:[~2013-08-14 17:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 17:03 [PATCH v10 00/10] sco: SCO socket option for voice_setting Frédéric Dalleau
2013-08-14 17:03 ` [PATCH v10 01/10] Bluetooth: Use hci_connect_sco directly Frédéric Dalleau
2013-08-14 17:03 ` [PATCH v10 02/10] Bluetooth: Remove unused mask parameter in sco_conn_defer_accept Frédéric Dalleau
2013-08-14 17:03 ` [PATCH v10 03/10] Bluetooth: Add Bluetooth socket voice option Frédéric Dalleau
2013-08-14 17:03 ` [PATCH v10 04/10] Bluetooth: Add constants for SCO airmode Frédéric Dalleau
2013-08-14 17:03 ` Frédéric Dalleau [this message]
2013-08-16 18:47 ` [PATCH v10 05/10] Bluetooth: Use voice setting in deferred SCO connection request Marcel Holtmann
2013-08-14 17:03 ` [PATCH v10 06/10] Bluetooth: Parameters for outgoing SCO connections Frédéric Dalleau
2013-08-16 18:47 ` Marcel Holtmann
2013-08-14 17:03 ` [PATCH v10 07/10] Bluetooth: Add constants and macro declaration for transparent data Frédéric Dalleau
2013-08-14 17:03 ` [PATCH v10 08/10] Bluetooth: Prevent transparent SCO on older devices Frédéric Dalleau
2013-08-16 18:45 ` Marcel Holtmann
2013-08-14 17:03 ` [PATCH v10 09/10] Bluetooth: Handle specific error for SCO connection fallback Frédéric Dalleau
2013-08-16 18:48 ` Marcel Holtmann
2013-08-14 17:03 ` [PATCH v10 10/10] Bluetooth: Add " Frédéric Dalleau
2013-08-16 18:55 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376499814-11386-6-git-send-email-frederic.dalleau@linux.intel.com \
--to=frederic.dalleau@linux.intel.com \
--cc=johan.hedberg@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).