Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
system/bta/ag/bta_ag_cfg.cc
+ 0
− 2
View file @ 685666e5
...@@ -41,13 +41,11 @@ ...@@ -41,13 +41,11 @@
#define BTA_AG_CONN_TIMEOUT 5000 #define BTA_AG_CONN_TIMEOUT 5000
#endif #endif
#ifndef BTA_AG_SCO_PKT_TYPES
/* S1 packet type setting from HFP 1.5 spec */ /* S1 packet type setting from HFP 1.5 spec */
#define BTA_AG_SCO_PKT_TYPES /* BTM_SCO_LINK_ALL_PKT_MASK */ \ #define BTA_AG_SCO_PKT_TYPES /* BTM_SCO_LINK_ALL_PKT_MASK */ \
(BTM_SCO_LINK_ONLY_MASK | ESCO_PKT_TYPES_MASK_EV3 | \ (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_EV3 | ESCO_PKT_TYPES_MASK_NO_2_EV5 | \
ESCO_PKT_TYPES_MASK_NO_3_EV5) ESCO_PKT_TYPES_MASK_NO_3_EV5)
#endif
#ifndef BTA_AG_BIND_INFO #ifndef BTA_AG_BIND_INFO
#define BTA_AG_BIND_INFO "(1)" #define BTA_AG_BIND_INFO "(1)"
......
system/internal_include/bt_target.h
+ 0
− 7
View file @ 685666e5
...@@ -68,13 +68,6 @@ ...@@ -68,13 +68,6 @@
#define BTA_AG_AT_MAX_LEN 512 #define BTA_AG_AT_MAX_LEN 512
#endif #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 #ifndef BTA_AV_RET_TOUT
#define BTA_AV_RET_TOUT 15 #define BTA_AV_RET_TOUT 15
#endif #endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment