Bluetooth: Add support for msbc coding format

In Enhanced_Setup_Synchronous_Command, add support for msbc
coding format

Signed-off-by: Kiran K <kiran.k@intel.com>
Reviewed-by: Chethan T N <chethan.tumkur.narayan@intel.com>
Reviewed-by: Srivatsa Ravishankar <ravishankar.srivatsa@intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 981ce32adc2e3d90ba3eaf208ce68b24c5edaf79..0a5f98081581a84e107656e99d60142fbb310a3f 100644 (file)
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -175,6 +175,7 @@ struct bt_codecs {
 
 #define BT_CODEC_CVSD          0x02
 #define BT_CODEC_TRANSPARENT   0x03
+#define BT_CODEC_MSBC          0x05
 
 __printf(1, 2)
 void bt_info(const char *fmt, ...);

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 46fbafe10c61be74c7095d199a01c981dbf8e2b2..bd669c95b9a7e92205e920647363e06aece60ac1 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -332,6 +332,32 @@ static bool hci_enhanced_setup_sync_conn(struct hci_conn *conn, __u16 handle)
        cp.rx_bandwidth   = cpu_to_le32(0x00001f40);
 
        switch (conn->codec.id) {
+       case BT_CODEC_MSBC:
+               if (!find_next_esco_param(conn, esco_param_msbc,
+                                         ARRAY_SIZE(esco_param_msbc)))
+                       return false;
+
+               param = &esco_param_msbc[conn->attempt - 1];
+               cp.tx_coding_format.id = 0x05;
+               cp.rx_coding_format.id = 0x05;
+               cp.tx_codec_frame_size = __cpu_to_le16(60);
+               cp.rx_codec_frame_size = __cpu_to_le16(60);
+               cp.in_bandwidth = __cpu_to_le32(32000);
+               cp.out_bandwidth = __cpu_to_le32(32000);
+               cp.in_coding_format.id = 0x04;
+               cp.out_coding_format.id = 0x04;
+               cp.in_coded_data_size = __cpu_to_le16(16);
+               cp.out_coded_data_size = __cpu_to_le16(16);
+               cp.in_pcm_data_format = 2;
+               cp.out_pcm_data_format = 2;
+               cp.in_pcm_sample_payload_msb_pos = 0;
+               cp.out_pcm_sample_payload_msb_pos = 0;
+               cp.in_data_path = conn->codec.data_path;
+               cp.out_data_path = conn->codec.data_path;
+               cp.in_transport_unit_size = 1;
+               cp.out_transport_unit_size = 1;
+               break;
+
        case BT_CODEC_TRANSPARENT:
                if (!find_next_esco_param(conn, esco_param_msbc,
                                          ARRAY_SIZE(esco_param_msbc)))