diff options
| -rwxr-xr-x | bta/dm/bta_dm_act.c | 94 | ||||
| -rwxr-xr-x[-rw-r--r--] | bta/dm/bta_dm_int.h | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | bta/hh/bta_hh_act.c | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | bta/include/bta_hh_api.h | 1 | ||||
| -rw-r--r-- | bta/sys/bta_sys_cfg.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | btif/src/btif_core.c | 11 | ||||
| -rwxr-xr-x | btif/src/btif_dm.c | 7 | ||||
| -rwxr-xr-x | btif/src/btif_hh.c | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | btif/src/btif_rc.c | 19 | ||||
| -rwxr-xr-x | include/bdroid_mako.txt | 171 | ||||
| -rw-r--r-- | stack/btm/btm_main.c | 2 | ||||
| -rw-r--r-- | stack/btu/btu_init.c | 2 |
12 files changed, 124 insertions, 197 deletions
diff --git a/bta/dm/bta_dm_act.c b/bta/dm/bta_dm_act.c index 8f88573..c087dc8 100755 --- a/bta/dm/bta_dm_act.c +++ b/bta/dm/bta_dm_act.c @@ -67,7 +67,7 @@ static void bta_dm_search_timer_cback (TIMER_LIST_ENT *p_tle); static void bta_dm_disable_timer_cback (TIMER_LIST_ENT *p_tle); static void bta_dm_disable_conn_down_timer_cback (TIMER_LIST_ENT *p_tle); static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, UINT8 id, UINT8 app_id, BD_ADDR peer_addr); -static void bta_dm_adjust_roles(void); +static void bta_dm_adjust_roles(BOOLEAN delay_role_switch); static char *bta_dm_get_remname(void); static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result); @@ -76,6 +76,10 @@ static void bta_dm_discover_device(BD_ADDR remote_bd_addr); static void bta_dm_sys_hw_cback( tBTA_SYS_HW_EVT status ); +static BOOLEAN bta_dm_dev_blacklisted_for_switch (BD_ADDR remote_bd_addr); +static void bta_dm_delay_role_switch_cback (TIMER_LIST_ENT *p_tle); + + #if ((defined BLE_INCLUDED) && (BLE_INCLUDED == TRUE)) #if ((defined SMP_INCLUDED) && (SMP_INCLUDED == TRUE)) static UINT8 bta_dm_ble_smp_cback (tBTM_LE_EVT event, BD_ADDR bda, tBTM_LE_EVT_DATA *p_data); @@ -193,6 +197,17 @@ const tBTM_APPL_INFO bta_security = }; +/* TBD... To be moved to some conf file..? */ +#define BTA_DM_MAX_ROLE_SWITCH_BLACKLIST_COUNT 5 +const tBTA_DM_LMP_VER_INFO bta_role_switch_blacklist[BTA_DM_MAX_ROLE_SWITCH_BLACKLIST_COUNT] = +{ + {0x000F,0x2000,0x04}, + {0x00,0x00,0x00}, + {0x00,0x00,0x00}, + {0x00,0x00,0x00}, + {0x00,0x00,0x00} +}; + #define MAX_DISC_RAW_DATA_BUF (4096) UINT8 g_disc_raw_data_buf[MAX_DISC_RAW_DATA_BUF]; @@ -3318,7 +3333,7 @@ void bta_dm_acl_change(tBTA_DM_MSG *p_data) } } - bta_dm_adjust_roles(); + bta_dm_adjust_roles(TRUE); } /******************************************************************************* @@ -3471,12 +3486,64 @@ static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, UINT8 id, UINT8 app_id, } - bta_dm_adjust_roles(); + bta_dm_adjust_roles(FALSE); } /******************************************************************************* ** +** Function bta_dm_dev_blacklisted_for_switch +** +** Description Checks if the device is blacklisted for immediate role switch after connection. +** +** Returns TRUE if dev is blacklisted else FALSE +** +*******************************************************************************/ +static BOOLEAN bta_dm_dev_blacklisted_for_switch (BD_ADDR remote_bd_addr) +{ + UINT16 manufacturer = 0; + UINT16 lmp_sub_version = 0; + UINT8 lmp_version = 0; + UINT8 i = 0; + + if (BTM_ReadRemoteVersion(remote_bd_addr, &lmp_version, + &manufacturer, &lmp_sub_version) == BTM_SUCCESS) + { + /* Check if this device version info matches with is + blacklisted versions for role switch */ + for (i = 0; i < BTA_DM_MAX_ROLE_SWITCH_BLACKLIST_COUNT; i++) + { + if ((bta_role_switch_blacklist[i].lmp_version == lmp_version) && + (bta_role_switch_blacklist[i].manufacturer == manufacturer)&& + ((bta_role_switch_blacklist[i].lmp_sub_version & lmp_sub_version) == + bta_role_switch_blacklist[i].lmp_sub_version)) + { + APPL_TRACE_EVENT0("Black list F/W version matches.. Delay Role Switch..."); + return TRUE; + } + + } + } + return FALSE; +} + +/******************************************************************************* +** +** Function bta_dm_delay_role_switch_cback +** +** Description Callback from btm to delay a role switch +** +** Returns void +** +*******************************************************************************/ +static void bta_dm_delay_role_switch_cback(TIMER_LIST_ENT *p_tle) +{ + APPL_TRACE_EVENT0("bta_dm_delay_role_switch_cback: initiating Delayed RS"); + bta_dm_adjust_roles (FALSE); +} + +/******************************************************************************* +** ** Function bta_dm_adjust_roles ** ** Description Adjust roles @@ -3485,7 +3552,7 @@ static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, UINT8 id, UINT8 app_id, ** Returns void ** *******************************************************************************/ -static void bta_dm_adjust_roles(void) +static void bta_dm_adjust_roles(BOOLEAN delay_role_switch) { UINT8 i; @@ -3520,8 +3587,25 @@ static void bta_dm_adjust_roles(void) || (bta_dm_cb.device_list.count > 1)) { - BTM_SwitchRole (bta_dm_cb.device_list.peer_device[i].peer_bdaddr, HCI_ROLE_MASTER, NULL); + /* Initiating immediate role switch with certain remote devices + has caused issues due to role switch colliding with link encryption setup and + causing encryption (and in turn the link) to fail . These device . Firmware + versions are stored in a blacklist and role switch with these devices are + delayed to avoid the collision with link encryption setup */ + if ((delay_role_switch == FALSE) || + (bta_dm_dev_blacklisted_for_switch( + bta_dm_cb.device_list.peer_device[i].peer_bdaddr) == FALSE)) + { + BTM_SwitchRole (bta_dm_cb.device_list.peer_device[i].peer_bdaddr, + HCI_ROLE_MASTER, NULL); + } + else + { + bta_dm_cb.switch_delay_timer.p_cback = + (TIMER_CBACK*)&bta_dm_delay_role_switch_cback; + bta_sys_start_timer(&bta_dm_cb.switch_delay_timer, 0, 500); + } } } diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h index 6d220e7..0d8dc6a 100644..100755 --- a/bta/dm/bta_dm_int.h +++ b/bta/dm/bta_dm_int.h @@ -705,6 +705,7 @@ typedef struct tBTA_DM_ENCRYPT_CBACK *p_encrypt_cback; tBTA_DM_BLE_SEC_ACT sec_act; + TIMER_LIST_ENT switch_delay_timer; } tBTA_DM_CB; @@ -838,6 +839,13 @@ typedef struct UINT16 min_loc_to; } tBTA_DM_SSR_SPEC; +typedef struct +{ + UINT16 manufacturer; + UINT16 lmp_sub_version; + UINT8 lmp_version; +}tBTA_DM_LMP_VER_INFO; + extern tBTA_DM_PM_CFG *p_bta_dm_pm_cfg; extern tBTA_DM_PM_SPEC *p_bta_dm_pm_spec; extern tBTM_PM_PWR_MD *p_bta_dm_pm_md; diff --git a/bta/hh/bta_hh_act.c b/bta/hh/bta_hh_act.c index 0b771ab..163597e 100644..100755 --- a/bta/hh/bta_hh_act.c +++ b/bta/hh/bta_hh_act.c @@ -873,14 +873,12 @@ void bta_hh_maint_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data) p_dev_info->app_id); /* update cb_index[] map */ bta_hh_cb.cb_index[dev_handle] = p_cb->index; - dev_info.attr_mask = p_dev_info->attr_mask; } } else /* device already been added */ { dev_info.handle = p_cb->hid_handle; dev_info.status = BTA_HH_OK; - dev_info.attr_mask = p_dev_info->attr_mask; } #if BTA_HH_DEBUG bta_hh_trace_dev_db(); @@ -901,7 +899,6 @@ void bta_hh_maint_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data) bta_hh_clean_up_kdev(p_cb); } } - dev_info.attr_mask = 0; /* Reset the attribute mask */ break; default: diff --git a/bta/include/bta_hh_api.h b/bta/include/bta_hh_api.h index 7be05db..dd9a528 100644..100755 --- a/bta/include/bta_hh_api.h +++ b/bta/include/bta_hh_api.h @@ -173,7 +173,6 @@ typedef struct BD_ADDR bda; /* HID device bd address */ tBTA_HH_STATUS status; /* operation status */ UINT8 handle; /* device handle */ - UINT16 attr_mask; /* HID Device attribute Mask*/ } tBTA_HH_CONN; typedef tBTA_HH_CONN tBTA_HH_DEV_INFO; diff --git a/bta/sys/bta_sys_cfg.c b/bta/sys/bta_sys_cfg.c index 4d102ef..bf728cd 100644 --- a/bta/sys/bta_sys_cfg.c +++ b/bta/sys/bta_sys_cfg.c @@ -34,7 +34,7 @@ const tBTA_SYS_CFG bta_sys_cfg = BTA_MBOX_EVT, /* GKI mailbox event */ BTA_MBOX, /* GKI mailbox id */ BTA_TIMER, /* GKI timer id */ - BT_TRACE_LEVEL_DEBUG //TODO: Fix this - APPL_INITIAL_TRACE_LEVEL /* initial trace level */ + APPL_INITIAL_TRACE_LEVEL /* initial trace level */ }; tBTA_SYS_CFG *p_bta_sys_cfg = (tBTA_SYS_CFG *)&bta_sys_cfg; diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c index 666efa7..032ddf0 100644..100755 --- a/btif/src/btif_core.c +++ b/btif/src/btif_core.c @@ -1108,6 +1108,8 @@ bt_status_t btif_set_adapter_property(const bt_property_t *property) btif_storage_req_t req; bt_status_t status = BT_STATUS_SUCCESS; int storage_req_id = BTIF_CORE_STORAGE_NOTIFY_STATUS; /* default */ + char bd_name[BTM_MAX_LOC_BD_NAME_LEN +1]; + UINT16 name_len = 0; BTIF_TRACE_EVENT3("btif_set_adapter_property type: %d, len %d, 0x%x", property->type, property->len, property->val); @@ -1119,9 +1121,14 @@ bt_status_t btif_set_adapter_property(const bt_property_t *property) { case BT_PROPERTY_BDNAME: { - BTIF_TRACE_EVENT1("set property name : %s", (char *)property->val); + name_len = property->len > BTM_MAX_LOC_BD_NAME_LEN ? BTM_MAX_LOC_BD_NAME_LEN: + property->len; + memcpy(bd_name,property->val, name_len); + bd_name[name_len] = '\0'; - BTA_DmSetDeviceName((char *)property->val); + BTIF_TRACE_EVENT1("set property name : %s", (char *)bd_name); + + BTA_DmSetDeviceName((char *)bd_name); storage_req_id = BTIF_CORE_STORAGE_ADAPTER_WRITE; } diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index a1ff3f3..d31e1ca 100755 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -96,6 +96,7 @@ typedef struct { UINT8 is_ssp; UINT8 autopair_attempts; UINT8 is_local_initiated; + UINT8 bonded_pending_sdp; } btif_dm_pairing_cb_t; typedef struct { @@ -674,6 +675,7 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ *p_ssp_cfm_req) cod = COD_UNCLASSIFIED; } + pairing_cb.bonded_pending_sdp = FALSE; HAL_CBACK(bt_hal_cbacks, ssp_request_cb, &bd_addr, &bd_name, cod, (p_ssp_cfm_req->just_works ? BT_SSP_VARIANT_CONSENT : BT_SSP_VARIANT_PASSKEY_CONFIRMATION), p_ssp_cfm_req->num_val); @@ -749,6 +751,7 @@ static void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl) state = BT_BOND_STATE_BONDED; /* Trigger SDP on the device */ + pairing_cb.bonded_pending_sdp = TRUE; btif_dm_get_remote_services(&bd_addr); /* Do not call bond_state_changed_cb yet. Wait till fetch remote service is complete */ } @@ -1005,10 +1008,12 @@ static void btif_dm_search_services_evt(UINT16 event, char *p_param) ** bond_state_changed needs to be sent prior to remote_device_property */ if ((pairing_cb.state == BT_BOND_STATE_BONDING) && - bdcmp(p_data->disc_res.bd_addr, pairing_cb.bd_addr) == 0) + (bdcmp(p_data->disc_res.bd_addr, pairing_cb.bd_addr) == 0)&& + pairing_cb.bonded_pending_sdp == TRUE) { BTIF_TRACE_DEBUG1("%s Remote Service SDP done. Call bond_state_changed_cb BONDED", __FUNCTION__); + pairing_cb.bonded_pending_sdp = FALSE; bond_state_changed(BT_STATUS_SUCCESS, &bd_addr, BT_BOND_STATE_BONDED); } diff --git a/btif/src/btif_hh.c b/btif/src/btif_hh.c index 76d8ec3..2e9387a 100755 --- a/btif/src/btif_hh.c +++ b/btif/src/btif_hh.c @@ -740,7 +740,6 @@ static void btif_hh_upstreams_evt(UINT16 event, char* p_param) if (memcmp(btif_hh_cb.added_devices[i].bd_addr.address, p_data->dev_info.bda, 6) == 0) { if (p_data->dev_info.status == BTA_HH_OK) { btif_hh_cb.added_devices[i].dev_handle = p_data->dev_info.handle; - btif_hh_cb.added_devices[i].attr_mask = p_data->dev_info.attr_mask; } else { memset(btif_hh_cb.added_devices[i].bd_addr.address, 0, 6); diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c index 248696a..1e8a220 100644..100755 --- a/btif/src/btif_rc.c +++ b/btif/src/btif_rc.c @@ -353,18 +353,19 @@ void handle_rc_passthrough_cmd ( tBTA_AV_REMOTE_CMD *p_remote_cmd) pressed = 1; } - /* If this is Play command (press or release) before processing, check the following - *a voice call has ended recently - * the remote device is not of type headset - * If the above conditions meet, drop the Play command - *This fix is to interop with certain carkits which sends an automatic PLAY commands right after call ends - */ - if((p_remote_cmd->rc_id == BTA_AV_RC_PLAY )&& + /* If this is Play/Pause command (press or release) before processing, check the following + * a voice call has ended recently + * the remote device is not of type headset + * If the above conditions meet, drop the Play/Pause command + * This fix is to interop with certain carkits which sends an automatic PLAY or PAUSE + * commands right after call ends + */ + if((p_remote_cmd->rc_id == BTA_AV_RC_PLAY || p_remote_cmd->rc_id == BTA_AV_RC_PAUSE)&& (btif_hf_call_terminated_recently() == TRUE) && (check_cod( (const bt_bdaddr_t*)&(btif_rc_cb.rc_addr), COD_AV_HEADSETS) != TRUE)) { - BTIF_TRACE_DEBUG1("%s:Dropping the play command received right after call end", - __FUNCTION__); + BTIF_TRACE_DEBUG2("%s:Dropping the play/Pause command received right after call end cmd:%d", + __FUNCTION__,p_remote_cmd->rc_id); return; } diff --git a/include/bdroid_mako.txt b/include/bdroid_mako.txt deleted file mode 100755 index 9706ac0..0000000 --- a/include/bdroid_mako.txt +++ /dev/null @@ -1,171 +0,0 @@ -AVCT_INCLUDED = TRUE -AVRC_INCLUDED = TRUE -AVDT_INCLUDED = TRUE -UNV_INCLUDED = FALSE -A2D_INCLUDED = TRUE -A2D_SBC_INCLUDED = TRUE -DUN_INCLUDED = FALSE -GAP_INCLUDED = FALSE -GOEP_INCLUDED = FALSE -GOEP_FS_INCLUDED = FALSE -GATT_PTS = FALSE -BTM_SEC_MAX_SERVICE_RECORDS = 32 -L2CAP_INCLUDED = TRUE -L2CAP_LINK_INACTIVITY_TOUT = 4 -L2CAP_FCR_INCLUDED = TRUE -L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS) -BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) -RFCOMM_INCLUDED = TRUE -MAX_RFC_PORTS = 30 -MAX_ACL_CONNECTIONS = 7 -MAX_L2CAP_CHANNELS = 16 -BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD) -PORT_TX_BUF_HIGH_WM = 10 -PORT_RX_BUF_HIGH_WM = 10 -PORT_RX_BUF_LOW_WM = 4 -PORT_RX_BUF_CRITICAL_WM = 15 -PORT_TX_BUF_CRITICAL_WM = 15 -PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM) -PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM) -PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM) -PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM) -PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM) -BTA_DUN_MTU = BTA_RFC_MTU_SIZE -BTA_SPP_MTU = BTA_RFC_MTU_SIZE -BTA_FAX_MTU = BTA_RFC_MTU_SIZE -SDP_DI_INCLUDED = TRUE -SDP_RAW_DATA_INCLUDED = TRUE -SDP_RAW_PDU_INCLUDED = TRUE -SDP_POOL_ID = 3 -SDP_MAX_REC_ATTR = 25 -SDP_MAX_ATTR_LEN = 400 -SDP_MAX_PAD_LEN = 600 -BNEP_INCLUDED = TRUE -PAN_INCLUDED = TRUE -HID_DEV_INCLUDED = FALSE -HID_HOST_INCLUDED = TRUE -BLE_INCLUDED = FALSE -BTM_BLE_CONFORMANCE_TESTING = FALSE -ATT_INCLUDED = FALSE -ATT_DEBUG = FALSE -GATTS_APPU_USE_GATT_TRACE = FALSE -GATT_CLIENT_ENABLED = FALSE -GATT_SERVER_ENABLED = FALSE -SMP_INCLUDED = FALSE -SMP_HOST_ENCRYPT_INCLUDED = FALSE -SER_INCLUDED = FALSE -RPC_INCLUDED = FALSE -MMI_INCLUDED = FALSE -SAP_INCLUDED = FALSE -SBC_NO_PCM_CPY_OPTION = FALSE -SBC_IPAQ_OPT = FALSE -SBC_IS_64_MULT_IN_QUANTIZER = FALSE -BTA_INCLUDED = TRUE -BTA_AG_INCLUDED = TRUE -BTA_CT_INCLUDED = FALSE -BTA_CG_INCLUDED = FALSE -BTA_DG_INCLUDED = FALSE -BTA_FT_INCLUDED = FALSE -BTA_OP_INCLUDED = FALSE -BTA_PR_INCLUDED = FALSE -BTA_SS_INCLUDED = FALSE -BTA_DM_INCLUDED = TRUE -BTA_DI_INCLUDED = FALSE -BTA_BI_INCLUDED = FALSE -BTA_SC_INCLUDED = FALSE -BTA_PAN_INCLUDED = TRUE -BTA_FS_INCLUDED = TRUE -BTA_AC_INCLUDED = FALSE -BTA_HD_INCLUDED = FALSE -BTA_HH_INCLUDED = TRUE -BTA_HH_ROLE = BTA_MASTER_ROLE_PREF -BTA_AR_INCLUDED = TRUE -BTA_AV_INCLUDED = TRUE -BTA_AV_VDP_INCLUDED = FALSE -BTA_AVK_INCLUDED = FALSE -BTA_PBS_INCLUDED = FALSE -BTA_PBC_INCLUDED = FALSE -BTA_FM_INCLUDED = FALSE -BTA_FM_DEBUG = FALSE -BTA_FMTX_INCLUDED = FALSE -BTA_FMTX_DEBUG = FALSE -BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE -BTA_FMTX_US_FCC_RULES = FALSE -BTA_HS_INCLUDED = FALSE -BTA_MSE_INCLUDED = FALSE -BTA_MCE_INCLUDED = FALSE -BTA_PLAYBACK_INCLUDED = FALSE -BTA_SSR_INCLUDED = FALSE -BTA_JV_INCLUDED = FALSE -BTA_EIR_CANNED_UUID_LIST = FALSE -BTA_GATT_INCLUDED = FALSE -RSI_INCLUDED = TRUE -RPC_TRACE_ONLY = FALSE -ANDROID_APP_INCLUDED = TRUE -ANDROID_USE_LOGCAT = TRUE -LINUX_GKI_INCLUDED = TRUE -TICKS_PER_SEC = 100 -QUICK_TIMER_TICKS_PER_SEC = 10 -BTA_SYS_TIMER_PERIOD = 100 -GKI_BUF1_SIZE = 288 -GKI_BUF3_MAX = 200 -GKI_BUF3_SIZE = (4096+16) -GKI_BUF4_SIZE = (8080+26) -GKI_SHUTDOWN_EVT = APPL_EVT_7 -GKI_PTHREAD_JOINABLE = TRUE -LINUX_DRV_INCLUDED = TRUE -LINUX_OS = TRUE -BTU_TASK = 0 -BTIF_TASK = 1 -A2DP_MEDIA_TASK = 2 -GKI_MAX_TASKS = 3 -BTM_APP_DEV_INIT = bte_main_post_reset_init -BTE_IDLE_TASK_INCLUDED = FALSE -APPL_INCLUDED = TRUE -BTU_BTA_INCLUDED = TRUE -SBC_FOR_EMBEDDED_LINUX = TRUE -BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248 -BTM_MAX_REM_BD_NAME_LEN = 248 -BTM_MAX_LOC_BD_NAME_LEN = 248 -BTM_USE_DEF_LOCAL_NAME = TRUE -BTM_DEF_LOCAL_NAME = "Nexus" -BTM_INQ_DB_SIZE = 40 -BTM_SEC_MAX_DEVICE_RECORDS = 100 -BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE -BTM_AUTOMATIC_HCI_RESET = FALSE -AVDT_VERSION = 0x0102 -BTA_AG_AT_MAX_LEN = 512 -BTA_AVRCP_FF_RW_SUPPORT = TRUE -BTM_MAX_SCO_LINKS = 2 -BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5) -BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE) -BTA_AV_MAX_A2DP_MTU = 668 -BTA_AV_RET_TOUT = 15 -PORCHE_PAIRING_CONFLICT = TRUE -BTA_AV_CO_CP_SCMS_T = FALSE -AVDT_CONNECT_CP_ONLY = FALSE -BTL_CFG_USE_CONF_FILE = FALSE -BTAPP_AHF_API_SUPPORT = TRUE -HCILP_INCLUDED = TRUE -HCISU_H4_INCLUDED = TRUE -BT_TRACE_PROTOCOL = TRUE -BT_USE_TRACES = TRUE -BT_TRACE_BTIF = TRUE -BTTRC_INCLUDED = FALSE -BT_TRACE_VERBOSE = FALSE -BTTRC_PARSER_INCLUDED = FALSE -MAX_TRACE_RAM_SIZE = 10000 -OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR -BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE -BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK) -PBAP_ZERO_VCARD_IN_DB = FALSE -BTA_DM_SDP_DB_SIZE = 8000 -MAX_L2CAP_CLIENTS = 15 -FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE -HID_HOST_MAX_CONN_RETRY = (3) -BTM_DISC_DURING_RS = TRUE -BTM_WBS_INCLUDED = FALSE -HL_INCLUDED = TRUE -NO_GKI_RUN_RETURN = TRUE -AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS -BTIF_DM_OOB_TEST = TRUE diff --git a/stack/btm/btm_main.c b/stack/btm/btm_main.c index 42489e1..67be0f2 100644 --- a/stack/btm/btm_main.c +++ b/stack/btm/btm_main.c @@ -43,8 +43,6 @@ void btm_init (void) #else btm_cb.trace_level = BT_TRACE_LEVEL_NONE; /* No traces */ #endif - /* TODO Bluedroid - Hardcoded trace level. Needs to be configurable */ - btm_cb.trace_level = BT_TRACE_LEVEL_DEBUG; /* Initialize BTM component structures */ btm_inq_db_init(); /* Inquiry Database and Structures */ btm_acl_init(); /* ACL Database and Structures */ diff --git a/stack/btu/btu_init.c b/stack/btu/btu_init.c index b1b7b2b..a153ed8 100644 --- a/stack/btu/btu_init.c +++ b/stack/btu/btu_init.c @@ -85,7 +85,7 @@ void BTE_Init(void) #if (BLE_INCLUDED == TRUE) btu_cb.hcit_ble_acl_pkt_size = BTU_DEFAULT_BLE_DATA_SIZE + HCI_DATA_PREAMBLE_SIZE; #endif - btu_cb.trace_level = BT_TRACE_LEVEL_DEBUG; //HCI_INITIAL_TRACE_LEVEL; + btu_cb.trace_level = HCI_INITIAL_TRACE_LEVEL; for ( i = 0; i < BTU_MAX_LOCAL_CTRLS; i++ ) /* include BR/EDR */ btu_cb.hci_cmd_cb[i].cmd_window = 1; |