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

Commit 685666e5 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "bt_target.h: Remove BTA_AG_SCO_PKT_TYPES" into main

parents d5634296 7b891ce8

system/bta/ag/bta_ag_cfg.cc

+0 −2
Original line number Diff line number Diff line
@@ -41,13 +41,11 @@ 
#define BTA_AG_CONN_TIMEOUT 5000

#endif



#ifndef BTA_AG_SCO_PKT_TYPES

/* S1 packet type setting from HFP 1.5 spec */

#define BTA_AG_SCO_PKT_TYPES /* BTM_SCO_LINK_ALL_PKT_MASK */     \

  (BTM_SCO_LINK_ONLY_MASK | ESCO_PKT_TYPES_MASK_EV3 |            \

   ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 | \

   ESCO_PKT_TYPES_MASK_NO_3_EV5)

#endif



#ifndef BTA_AG_BIND_INFO

#define BTA_AG_BIND_INFO "(1)"

system/internal_include/bt_target.h

+0 −7
Original line number Diff line number Diff line
@@ -68,13 +68,6 @@ 
#define BTA_AG_AT_MAX_LEN 512

#endif



#ifndef BTA_AG_SCO_PKT_TYPES

#define BTA_AG_SCO_PKT_TYPES                                     \

  (BTM_SCO_LINK_ONLY_MASK | ESCO_PKT_TYPES_MASK_EV3 |            \

   ESCO_PKT_TYPES_MASK_NO_3_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 | \

   ESCO_PKT_TYPES_MASK_NO_3_EV5)

#endif



#ifndef BTA_AV_RET_TOUT

#define BTA_AV_RET_TOUT 15

#endif