@@ -173,6 +173,8 @@ struct bt_codecs {
struct bt_codec codecs[];
} __packed;
+#define CODING_FORMAT_CVSD 0x02
+
__printf(1, 2)
void bt_info(const char *fmt, ...);
__printf(1, 2)
@@ -67,6 +67,7 @@ struct sco_pinfo {
__u32 flags;
__u16 setting;
__u8 cmsg_mask;
+ struct bt_codec codec;
struct sco_conn *conn;
};
@@ -438,6 +439,7 @@ static void __sco_sock_close(struct sock *sk)
sock_set_flag(sk, SOCK_ZAPPED);
break;
}
+
}
/* Must be called on unlocked socket. */
@@ -499,6 +501,10 @@ static struct sock *sco_sock_alloc(struct net *net, struct socket *sock,
sk->sk_state = BT_OPEN;
sco_pi(sk)->setting = BT_VOICE_CVSD_16BIT;
+ sco_pi(sk)->codec.id = CODING_FORMAT_CVSD;
+ sco_pi(sk)->codec.cid = 0xffff;
+ sco_pi(sk)->codec.vid = 0xffff;
+ sco_pi(sk)->codec.data_path = 0x00;
timer_setup(&sk->sk_timer, sco_sock_timeout, 0);
@@ -808,6 +814,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
struct sock *sk = sock->sk;
int len, err = 0;
struct bt_voice voice;
+ struct bt_codecs *codecs;
+ struct hci_dev *hdev;
+ __u8 buffer[255];
u32 opt;
BT_DBG("sk %p", sk);
@@ -870,6 +879,56 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
sco_pi(sk)->cmsg_mask &= SCO_CMSG_PKT_STATUS;
break;
+ case BT_CODEC:
+ if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND &&
+ sk->sk_state != BT_CONNECT2) {
+ err = -EINVAL;
+ break;
+ }
+
+ hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src, BDADDR_BREDR);
+ if (!hdev) {
+ err = -EBADFD;
+ break;
+ }
+
+ if (!hdev->set_data_path) {
+ err = -EOPNOTSUPP;
+ break;
+ }
+
+ if (optlen < sizeof(struct bt_codecs) || optlen > 255) {
+ err = -EINVAL;
+ break;
+ }
+
+ if (copy_from_sockptr(buffer, optval, optlen)) {
+ err = -EFAULT;
+ break;
+ }
+
+ codecs = (void *)buffer;
+
+ if (codecs->num_codecs > 1) {
+ err = -EINVAL;
+ break;
+ }
+
+ if (codecs->codecs[0].data_path) {
+ err = hdev->set_data_path(hdev, SCO_LINK,
+ codecs->codecs);
+ if (err < 0)
+ break;
+
+ if (codecs->codecs[0].id == 0xff) {
+ sco_pi(sk)->codec.cid = codecs->codecs[0].cid;
+ sco_pi(sk)->codec.vid = codecs->codecs[0].vid;
+ }
+ }
+ sco_pi(sk)->codec.id = codecs->codecs[0].id;
+ sco_pi(sk)->codec.data_path = codecs->codecs[0].data_path;
+ break;
+
default:
err = -ENOPROTOOPT;
break;