Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e210da03 authored by Chris Manton's avatar Chris Manton
Browse files

Move BTM_VOICE_SETTING from header to source 

Bug: 224999611
Test: mma .

Change-Id: Ia496161e14c41cca2fb1e47e092237a693235be3
parent 03e5fac5

system/bta/ag/bta_ag_sco.cc

+8 −0
Original line number Diff line number Diff line
@@ -50,6 +50,14 @@ extern tBTM_CB btm_cb; 
#define BTA_AG_CODEC_NEGOTIATION_TIMEOUT_MS (3 * 1000) /* 3 seconds */

#endif



#define BTM_VOICE_SETTING_CVSD                                         \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_CVSD))



#define BTM_VOICE_SETTING_TRANS                                        \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_TRANSPNT))



static bool sco_allowed = true;

static RawAddress active_device_addr = {};

system/stack/include/btm_api_types.h

+0 −7
Original line number Diff line number Diff line
@@ -178,13 +178,6 @@ typedef uint16_t tBTM_SCO_CODEC_TYPE; 
/*******************

 * SCO Voice Settings

 *******************/

#define BTM_VOICE_SETTING_CVSD                                         \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_CVSD))



#define BTM_VOICE_SETTING_TRANS                                        \

  ((uint16_t)(HCI_INP_CODING_LINEAR | HCI_INP_DATA_FMT_2S_COMPLEMENT | \

              HCI_INP_SAMPLE_SIZE_16BIT | HCI_AIR_CODING_FORMAT_TRANSPNT))



/*******************

 * SCO Data Status