Move sco packet types to sco initialization

Towards encapsulated code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: Ief025f785d33f281768b23f7d4ea8b98f961f573

diff --git a/stack/btm/btm_devctl.cc b/stack/btm/btm_devctl.cc
index f45da64..94a9189 100644 (file)
--- a/stack/btm/btm_devctl.cc
+++ b/stack/btm/btm_devctl.cc
@@ -95,11 +95,6 @@ void btm_dev_init() {
   btm_cb.devcb.read_link_quality_timer =
       alarm_new("btm.read_link_quality_timer");
   btm_cb.devcb.read_tx_power_timer = alarm_new("btm.read_tx_power_timer");
-
-  btm_cb.btm_sco_pkt_types_supported =
-      ESCO_PKT_TYPES_MASK_HV1 + ESCO_PKT_TYPES_MASK_HV2 +
-      ESCO_PKT_TYPES_MASK_HV3 + ESCO_PKT_TYPES_MASK_EV3 +
-      ESCO_PKT_TYPES_MASK_EV4 + ESCO_PKT_TYPES_MASK_EV5;
 }
 
 void btm_dev_free() {

diff --git a/stack/btm/btm_sco.cc b/stack/btm/btm_sco.cc
index b5f9dd1..5a2c34c 100644 (file)
--- a/stack/btm/btm_sco.cc
+++ b/stack/btm/btm_sco.cc
@@ -99,6 +99,11 @@ void btm_sco_init(void) {
   btm_cb.sco_cb.def_esco_parms = esco_parameters_for_codec(ESCO_CODEC_CVSD);
   btm_cb.sco_cb.def_esco_parms.max_latency_ms = 12;
   btm_cb.sco_cb.sco_route = ESCO_DATA_PATH_PCM;
+
+  btm_cb.btm_sco_pkt_types_supported =
+      ESCO_PKT_TYPES_MASK_HV1 + ESCO_PKT_TYPES_MASK_HV2 +
+      ESCO_PKT_TYPES_MASK_HV3 + ESCO_PKT_TYPES_MASK_EV3 +
+      ESCO_PKT_TYPES_MASK_EV4 + ESCO_PKT_TYPES_MASK_EV5;
 }
 
 /*******************************************************************************