diff options
| -rw-r--r-- | system/bta/gatt/bta_gattc_act.cc | 8 | ||||
| -rw-r--r-- | system/bta/hl/bta_hl_act.cc | 199 | ||||
| -rw-r--r-- | system/include/bt_target.h | 4 | ||||
| -rw-r--r-- | system/include/bt_trace.h | 4 | ||||
| -rw-r--r-- | system/stack/avct/avct_lcb.cc | 12 | ||||
| -rw-r--r-- | system/stack/btm/btm_int_types.h | 4 | ||||
| -rw-r--r-- | system/stack/btm/btm_sec.cc | 13 | ||||
| -rw-r--r-- | system/stack/l2cap/l2c_csm.cc | 50 | ||||
| -rw-r--r-- | system/stack/l2cap/l2c_fcr.cc | 15 | ||||
| -rw-r--r-- | system/stack/mcap/mca_csm.cc | 6 | ||||
| -rw-r--r-- | system/stack/mcap/mca_dsm.cc | 6 | ||||
| -rw-r--r-- | system/stack/sdp/sdp_db.cc | 4 |
12 files changed, 71 insertions, 254 deletions
diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc index 7895cf2757..a2e88e266b 100644 --- a/system/bta/gatt/bta_gattc_act.cc +++ b/system/bta/gatt/bta_gattc_act.cc @@ -76,11 +76,9 @@ static uint16_t bta_gattc_opcode_to_int_evt[] = { BTA_GATTC_API_READ_EVT, BTA_GATTC_API_WRITE_EVT, BTA_GATTC_API_EXEC_EVT, BTA_GATTC_API_CFG_MTU_EVT}; -#if (BT_TRACE_VERBOSE == TRUE) static const char* bta_gattc_op_code_name[] = { "Unknown", "Discovery", "Read", "Write", "Exec", "Config", "Notification", "Indication"}; -#endif // BT_TRACE_VERBOSE /***************************************************************************** * Action Functions ****************************************************************************/ @@ -1192,16 +1190,10 @@ void bta_gattc_op_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { GATTC_OPTYPE_READ; if (mapped_op > GATTC_OPTYPE_INDICATION) mapped_op = 0; -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_ERROR( "expect op:(%s :0x%04x), receive unexpected operation (%s).", bta_gattc_op_code_name[mapped_op], p_clcb->p_q_cmd->hdr.event, bta_gattc_op_code_name[op]); -#else - APPL_TRACE_ERROR( - "expect op:(%u :0x%04x), receive unexpected operation (%u).", - mapped_op, p_clcb->p_q_cmd->hdr.event, op); -#endif return; } diff --git a/system/bta/hl/bta_hl_act.cc b/system/bta/hl/bta_hl_act.cc index 5db57072d6..5d78f3247b 100644 --- a/system/bta/hl/bta_hl_act.cc +++ b/system/bta/hl/bta_hl_act.cc @@ -42,10 +42,10 @@ /***************************************************************************** * Local Function prototypes ****************************************************************************/ -#if (BTA_HL_DEBUG == TRUE && BT_TRACE_VERBOSE == TRUE) -static char* bta_hl_mcap_evt_code(uint8_t evt_code); -static char* bta_hl_dch_oper_code(tBTA_HL_DCH_OPER oper_code); -static char* bta_hl_cback_evt_code(uint8_t evt_code); +#if (BTA_HL_DEBUG == TRUE) +static const char* bta_hl_mcap_evt_code(uint8_t evt_code); +static const char* bta_hl_dch_oper_code(tBTA_HL_DCH_OPER oper_code); +static const char* bta_hl_cback_evt_code(uint8_t evt_code); #endif static void bta_hl_sdp_cback(uint8_t sdp_op, uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx, uint16_t status); @@ -472,12 +472,8 @@ void bta_hl_dch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx, tBTA_HL_STATUS status; #if (BTA_HL_DEBUG == TRUE) -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_DEBUG("bta_hl_dch_close_cmpl dch oper=%s", bta_hl_dch_oper_code(p_dcb->dch_oper)); -#else - APPL_TRACE_DEBUG("bta_hl_dch_close_cmpl dch oper=%d", p_dcb->dch_oper); -#endif #endif switch (p_dcb->dch_oper) { @@ -546,12 +542,8 @@ void bta_hl_dch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx, default: #if (BTA_HL_DEBUG == TRUE) -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_ERROR("DCH operation not found oper=%s", bta_hl_dch_oper_code(p_dcb->dch_oper)); -#else - APPL_TRACE_ERROR("DCH operation not found oper=%d", p_dcb->dch_oper); -#endif #endif send_evt = false; break; @@ -596,11 +588,7 @@ void bta_hl_dch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx, if (send_evt) { if (p_acb->p_cback) { #if (BTA_HL_DEBUG == TRUE) -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_DEBUG("Send Event: %s", bta_hl_cback_evt_code(event)); -#else - APPL_TRACE_DEBUG("Send Event: 0x%02x", event); -#endif #endif p_acb->p_cback(event, (tBTA_HL*)&evt_data); } @@ -622,12 +610,8 @@ void bta_hl_dch_mca_close_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx, tBTA_HL_MDL_CB* p_dcb = BTA_HL_GET_MDL_CB_PTR(app_idx, mcl_idx, mdl_idx); #if (BTA_HL_DEBUG == TRUE) -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_DEBUG("bta_hl_dch_mca_close_ind dch oper=%s", bta_hl_dch_oper_code(p_dcb->dch_oper)); -#else - APPL_TRACE_DEBUG("bta_hl_dch_mca_close_ind dch oper=%d", p_dcb->dch_oper); -#endif #endif p_dcb->intentional_close = false; @@ -661,12 +645,8 @@ void bta_hl_dch_mca_close_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx, tBTA_HL_MDL_CB* p_dcb = BTA_HL_GET_MDL_CB_PTR(app_idx, mcl_idx, mdl_idx); #if (BTA_HL_DEBUG == TRUE) -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_DEBUG("bta_hl_dch_mca_close_cfm dch_oper=%s", bta_hl_dch_oper_code(p_dcb->dch_oper)); -#else - APPL_TRACE_DEBUG("bta_hl_dch_mca_close_cfm dch_oper=%d", p_dcb->dch_oper); -#endif #endif switch (p_dcb->dch_oper) { @@ -682,12 +662,8 @@ void bta_hl_dch_mca_close_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx, break; default: #if (BTA_HL_DEBUG == TRUE) -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_ERROR("Invalid dch_oper=%s for close cfm", bta_hl_dch_oper_code(p_dcb->dch_oper)); -#else - APPL_TRACE_ERROR("Invalid dch_oper=%d for close cfm", p_dcb->dch_oper); -#endif #endif break; } @@ -2186,12 +2162,8 @@ void bta_hl_mcap_ctrl_cback(tMCA_HANDLE handle, tMCA_CL mcl, uint8_t event, uint16_t mca_event; #if (BTA_HL_DEBUG == TRUE) -#if (BT_TRACE_VERBOSE == TRUE) APPL_TRACE_EVENT("bta_hl_mcap_ctrl_cback event[%s]", bta_hl_mcap_evt_code(event)); -#else - APPL_TRACE_EVENT("bta_hl_mcap_ctrl_cback event[0x%02x]", event); -#endif #endif switch (event) { @@ -2288,7 +2260,11 @@ void bta_hl_mcap_data_cback(tMCA_DL mdl, BT_HDR* p_pkt) { /***************************************************************************** * Debug Functions ****************************************************************************/ -#if (BTA_HL_DEBUG == TRUE && BT_TRACE_VERBOSE == TRUE) +#if (BTA_HL_DEBUG == TRUE) + +#define CASE_RETURN_STR(const) \ + case const: \ + return #const; /******************************************************************************* * @@ -2299,43 +2275,25 @@ void bta_hl_mcap_data_cback(tMCA_DL mdl, BT_HDR* p_pkt) { * Returns char * - event string pointer * ******************************************************************************/ -static char* bta_hl_mcap_evt_code(uint8_t evt_code) { +static const char* bta_hl_mcap_evt_code(uint8_t evt_code) { switch (evt_code) { - case MCA_ERROR_RSP_EVT: - return "MCA_ERROR_RSP_EVT"; - case MCA_CREATE_IND_EVT: - return "MCA_CREATE_IND_EVT"; - case MCA_CREATE_CFM_EVT: - return "MCA_CREATE_CFM_EVT"; - case MCA_RECONNECT_IND_EVT: - return "MCA_RECONNECT_IND_EVT"; - case MCA_RECONNECT_CFM_EVT: - return "MCA_RECONNECT_CFM_EVT"; - case MCA_ABORT_IND_EVT: - return "MCA_ABORT_IND_EVT"; - case MCA_ABORT_CFM_EVT: - return "MCA_ABORT_CFM_EVT"; - case MCA_DELETE_IND_EVT: - return "MCA_DELETE_IND_EVT"; - case MCA_DELETE_CFM_EVT: - return "MCA_DELETE_CFM_EVT"; - - case MCA_CONNECT_IND_EVT: - return "MCA_CONNECT_IND_EVT"; - case MCA_DISCONNECT_IND_EVT: - return "MCA_DISCONNECT_IND_EVT"; - case MCA_OPEN_IND_EVT: - return "MCA_OPEN_IND_EVT"; - case MCA_OPEN_CFM_EVT: - return "MCA_OPEN_CFM_EVT"; - case MCA_CLOSE_IND_EVT: - return "MCA_CLOSE_IND_EVT"; - case MCA_CLOSE_CFM_EVT: - return "MCA_CLOSE_CFM_EVT"; - case MCA_CONG_CHG_EVT: - return "MCA_CONG_CHG_EVT"; - case MCA_RSP_TOUT_IND_EVT: - return "MCA_RSP_TOUT_IND_EVT"; + CASE_RETURN_STR(MCA_ERROR_RSP_EVT) + CASE_RETURN_STR(MCA_CREATE_IND_EVT) + CASE_RETURN_STR(MCA_CREATE_CFM_EVT) + CASE_RETURN_STR(MCA_RECONNECT_IND_EVT) + CASE_RETURN_STR(MCA_RECONNECT_CFM_EVT) + CASE_RETURN_STR(MCA_ABORT_IND_EVT) + CASE_RETURN_STR(MCA_ABORT_CFM_EVT) + CASE_RETURN_STR(MCA_DELETE_IND_EVT) + CASE_RETURN_STR(MCA_DELETE_CFM_EVT) + CASE_RETURN_STR(MCA_CONNECT_IND_EVT) + CASE_RETURN_STR(MCA_DISCONNECT_IND_EVT) + CASE_RETURN_STR(MCA_OPEN_IND_EVT) + CASE_RETURN_STR(MCA_OPEN_CFM_EVT) + CASE_RETURN_STR(MCA_CLOSE_IND_EVT) + CASE_RETURN_STR(MCA_CLOSE_CFM_EVT) + CASE_RETURN_STR(MCA_CONG_CHG_EVT) + CASE_RETURN_STR(MCA_RSP_TOUT_IND_EVT) default: return "Unknown MCAP event code"; } @@ -2350,50 +2308,29 @@ static char* bta_hl_mcap_evt_code(uint8_t evt_code) { * Returns char * - event string pointer * ******************************************************************************/ -static char* bta_hl_cback_evt_code(uint8_t evt_code) { +static const char* bta_hl_cback_evt_code(uint8_t evt_code) { switch (evt_code) { - case BTA_HL_CCH_OPEN_IND_EVT: - return "BTA_HL_CCH_OPEN_IND_EVT"; - case BTA_HL_CCH_OPEN_CFM_EVT: - return "BTA_HL_CCH_OPEN_CFM_EVT"; - case BTA_HL_CCH_CLOSE_IND_EVT: - return "BTA_HL_CCH_CLOSE_IND_EVT"; - case BTA_HL_CCH_CLOSE_CFM_EVT: - return "BTA_HL_CCH_CLOSE_CFM_EVT"; - case BTA_HL_DCH_OPEN_IND_EVT: - return "BTA_HL_DCH_OPEN_IND_EVT"; - case BTA_HL_DCH_OPEN_CFM_EVT: - return "BTA_HL_DCH_OPEN_CFM_EVT"; - case BTA_HL_DCH_CLOSE_IND_EVT: - return "BTA_HL_DCH_CLOSE_IND_EVT"; - case BTA_HL_DCH_CLOSE_CFM_EVT: - return "BTA_HL_DCH_CLOSE_CFM_EVT"; - case BTA_HL_DCH_RCV_DATA_IND_EVT: - return "BTA_HL_DCH_RCV_DATA_IND_EVT"; - case BTA_HL_REGISTER_CFM_EVT: - return "BTA_HL_REGISTER_CFM_EVT"; - case BTA_HL_DEREGISTER_CFM_EVT: - return "BTA_HL_DEREGISTER_CFM_EVT"; - case BTA_HL_DCH_RECONNECT_CFM_EVT: - return "BTA_HL_DCH_RECONNECT_CFM_EVT"; - case BTA_HL_DCH_RECONNECT_IND_EVT: - return "BTA_HL_DCH_RECONNECT_IND_EVT"; - case BTA_HL_DCH_ECHO_TEST_CFM_EVT: - return "BTA_HL_DCH_ECHO_TEST_CFM_EVT"; - case BTA_HL_SDP_QUERY_CFM_EVT: - return "BTA_HL_SDP_QUERY_CFM_EVT"; - case BTA_HL_CONG_CHG_IND_EVT: - return "BTA_HL_CONG_CHG_IND_EVT"; - case BTA_HL_DCH_CREATE_IND_EVT: - return "BTA_HL_DCH_CREATE_IND_EVT"; - case BTA_HL_DELETE_MDL_IND_EVT: - return "BTA_HL_DELETE_MDL_IND_EVT"; - case BTA_HL_DELETE_MDL_CFM_EVT: - return "BTA_HL_DELETE_MDL_CFM_EVT"; - case BTA_HL_DCH_ABORT_IND_EVT: - return "BTA_HL_DCH_ABORT_IND_EVT"; - case BTA_HL_DCH_ABORT_CFM_EVT: - return "BTA_HL_DCH_ABORT_CFM_EVT"; + CASE_RETURN_STR(BTA_HL_CCH_OPEN_IND_EVT) + CASE_RETURN_STR(BTA_HL_CCH_OPEN_CFM_EVT) + CASE_RETURN_STR(BTA_HL_CCH_CLOSE_IND_EVT) + CASE_RETURN_STR(BTA_HL_CCH_CLOSE_CFM_EVT) + CASE_RETURN_STR(BTA_HL_DCH_OPEN_IND_EVT) + CASE_RETURN_STR(BTA_HL_DCH_OPEN_CFM_EVT) + CASE_RETURN_STR(BTA_HL_DCH_CLOSE_IND_EVT) + CASE_RETURN_STR(BTA_HL_DCH_CLOSE_CFM_EVT) + CASE_RETURN_STR(BTA_HL_DCH_RCV_DATA_IND_EVT) + CASE_RETURN_STR(BTA_HL_REGISTER_CFM_EVT) + CASE_RETURN_STR(BTA_HL_DEREGISTER_CFM_EVT) + CASE_RETURN_STR(BTA_HL_DCH_RECONNECT_CFM_EVT) + CASE_RETURN_STR(BTA_HL_DCH_RECONNECT_IND_EVT) + CASE_RETURN_STR(BTA_HL_DCH_ECHO_TEST_CFM_EVT) + CASE_RETURN_STR(BTA_HL_SDP_QUERY_CFM_EVT) + CASE_RETURN_STR(BTA_HL_CONG_CHG_IND_EVT) + CASE_RETURN_STR(BTA_HL_DCH_CREATE_IND_EVT) + CASE_RETURN_STR(BTA_HL_DELETE_MDL_IND_EVT) + CASE_RETURN_STR(BTA_HL_DELETE_MDL_CFM_EVT) + CASE_RETURN_STR(BTA_HL_DCH_ABORT_IND_EVT) + CASE_RETURN_STR(BTA_HL_DCH_ABORT_CFM_EVT) default: return "Unknown HDP event code"; } @@ -2408,32 +2345,20 @@ static char* bta_hl_cback_evt_code(uint8_t evt_code) { * Returns char * - DCH operation string pointer * ******************************************************************************/ -static char* bta_hl_dch_oper_code(tBTA_HL_DCH_OPER oper_code) { +static const char* bta_hl_dch_oper_code(tBTA_HL_DCH_OPER oper_code) { switch (oper_code) { - case BTA_HL_DCH_OP_NONE: - return "BTA_HL_DCH_OP_NONE"; - case BTA_HL_DCH_OP_REMOTE_CREATE: - return "BTA_HL_DCH_OP_REMOTE_CREATE"; - case BTA_HL_DCH_OP_LOCAL_OPEN: - return "BTA_HL_DCH_OP_LOCAL_OPEN"; - case BTA_HL_DCH_OP_REMOTE_OPEN: - return "BTA_HL_DCH_OP_REMOTE_OPEN"; - case BTA_HL_DCH_OP_LOCAL_CLOSE: - return "BTA_HL_DCH_OP_LOCAL_CLOSE"; - case BTA_HL_DCH_OP_REMOTE_CLOSE: - return "BTA_HL_DCH_OP_REMOTE_CLOSE"; - case BTA_HL_DCH_OP_LOCAL_DELETE: - return "BTA_HL_DCH_OP_LOCAL_DELETE"; - case BTA_HL_DCH_OP_REMOTE_DELETE: - return "BTA_HL_DCH_OP_REMOTE_DELETE"; - case BTA_HL_DCH_OP_LOCAL_RECONNECT: - return "BTA_HL_DCH_OP_LOCAL_RECONNECT"; - case BTA_HL_DCH_OP_REMOTE_RECONNECT: - return "BTA_HL_DCH_OP_REMOTE_RECONNECT"; - case BTA_HL_DCH_OP_LOCAL_CLOSE_ECHO_TEST: - return "BTA_HL_DCH_OP_LOCAL_CLOSE_ECHO_TEST"; - case BTA_HL_DCH_OP_LOCAL_CLOSE_RECONNECT: - return "BTA_HL_DCH_OP_LOCAL_CLOSE_RECONNECT"; + CASE_RETURN_STR(BTA_HL_DCH_OP_NONE) + CASE_RETURN_STR(BTA_HL_DCH_OP_REMOTE_CREATE) + CASE_RETURN_STR(BTA_HL_DCH_OP_LOCAL_OPEN) + CASE_RETURN_STR(BTA_HL_DCH_OP_REMOTE_OPEN) + CASE_RETURN_STR(BTA_HL_DCH_OP_LOCAL_CLOSE) + CASE_RETURN_STR(BTA_HL_DCH_OP_REMOTE_CLOSE) + CASE_RETURN_STR(BTA_HL_DCH_OP_LOCAL_DELETE) + CASE_RETURN_STR(BTA_HL_DCH_OP_REMOTE_DELETE) + CASE_RETURN_STR(BTA_HL_DCH_OP_LOCAL_RECONNECT) + CASE_RETURN_STR(BTA_HL_DCH_OP_REMOTE_RECONNECT) + CASE_RETURN_STR(BTA_HL_DCH_OP_LOCAL_CLOSE_ECHO_TEST) + CASE_RETURN_STR(BTA_HL_DCH_OP_LOCAL_CLOSE_RECONNECT) default: return "Unknown DCH oper code"; } diff --git a/system/include/bt_target.h b/system/include/bt_target.h index 0fe260c831..4b2edb5510 100644 --- a/system/include/bt_target.h +++ b/system/include/bt_target.h @@ -136,10 +136,6 @@ #define BTA_HOST_INTERLEAVE_SEARCH FALSE #endif -#ifndef BT_TRACE_VERBOSE -#define BT_TRACE_VERBOSE FALSE -#endif - #ifndef BTA_DM_SDP_DB_SIZE #define BTA_DM_SDP_DB_SIZE 8000 #endif diff --git a/system/include/bt_trace.h b/system/include/bt_trace.h index 0c68aaeb27..d08403c812 100644 --- a/system/include/bt_trace.h +++ b/system/include/bt_trace.h @@ -122,10 +122,6 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module"; #define BTTRC_ID_MAX_ID BTTRC_ID_BT_PROTOCOL #define BTTRC_ID_ALL_LAYERS 0xFF /* all trace layers */ -/* Enables or disables verbose trace information. */ -#ifndef BT_TRACE_VERBOSE -#define BT_TRACE_VERBOSE FALSE -#endif /****************************************************************************** * diff --git a/system/stack/avct/avct_lcb.cc b/system/stack/avct/avct_lcb.cc index 636da97f66..96704ccd43 100644 --- a/system/stack/avct/avct_lcb.cc +++ b/system/stack/avct/avct_lcb.cc @@ -36,8 +36,6 @@ ** state machine constants and types *****************************************************************************/ -#if (BT_TRACE_VERBOSE == TRUE) - /* verbose state strings for trace */ const char * const avct_lcb_st_str[] = { "LCB_IDLE_ST", @@ -58,8 +56,6 @@ const char * const avct_lcb_evt_str[] = { "LL_CONG_EVT" }; -#endif - /* lcb state machine states */ enum { AVCT_LCB_IDLE_ST, @@ -198,11 +194,7 @@ void avct_lcb_event(tAVCT_LCB *p_lcb, uint8_t event, tAVCT_LCB_EVT *p_data) uint8_t action; int i; -#if (BT_TRACE_VERBOSE == TRUE) AVCT_TRACE_EVENT("LCB lcb=%d event=%s state=%s", p_lcb->allocated, avct_lcb_evt_str[event], avct_lcb_st_str[p_lcb->state]); -#else - AVCT_TRACE_EVENT("LCB lcb=%d event=%d state=%d", p_lcb->allocated, event, p_lcb->state); -#endif /* look up the state table for the current state */ state_table = avct_lcb_st_tbl[p_lcb->state]; @@ -240,11 +232,7 @@ void avct_bcb_event(tAVCT_BCB *p_bcb, uint8_t event, tAVCT_LCB_EVT *p_data) uint8_t action; int i; -#if (BT_TRACE_VERBOSE == TRUE) AVCT_TRACE_EVENT("BCB lcb=%d event=%s state=%s", p_bcb->allocated, avct_lcb_evt_str[event], avct_lcb_st_str[p_bcb->state]); -#else - AVCT_TRACE_EVENT("BCB lcb=%d event=%d state=%d", p_bcb->allocated, event, p_bcb->state); -#endif /* look up the state table for the current state */ state_table = avct_lcb_st_tbl[p_bcb->state]; diff --git a/system/stack/btm/btm_int_types.h b/system/stack/btm/btm_int_types.h index 6c61d41415..1b9d243ca1 100644 --- a/system/stack/btm/btm_int_types.h +++ b/system/stack/btm/btm_int_types.h @@ -867,9 +867,7 @@ typedef struct bool discing; fixed_queue_t *sec_pending_q; /* pending sequrity requests in tBTM_SEC_QUEUE_ENTRY format */ -#if (BT_TRACE_VERBOSE == FALSE) char state_temp_buffer[BTM_STATE_BUFFER_SIZE]; -#endif } tBTM_CB; /* security action for L2CAP COC channels */ @@ -885,4 +883,4 @@ typedef uint8_t tBTM_SEC_ACTION; } #endif -#endif // BTM_INT_TYPES_H
\ No newline at end of file +#endif // BTM_INT_TYPES_H diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index cc48e7dabc..e0462cf689 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -71,8 +71,8 @@ static void btm_sec_pairing_timeout(void *data); static tBTM_STATUS btm_sec_dd_create_conn (tBTM_SEC_DEV_REC *p_dev_rec); static void btm_sec_change_pairing_state (tBTM_PAIRING_STATE new_state); -static char *btm_pair_state_descr (tBTM_PAIRING_STATE state); - +static const char* btm_pair_state_descr (tBTM_PAIRING_STATE state); + static void btm_sec_check_pending_reqs(void); static bool btm_sec_queue_mx_request (BD_ADDR bd_addr, uint16_t psm, bool is_orig, uint32_t mx_proto_id, uint32_t mx_chan_id, @@ -5857,9 +5857,8 @@ static void btm_sec_change_pairing_state (tBTM_PAIRING_STATE new_state) ** Description Return state description for tracing ** *******************************************************************************/ -static char *btm_pair_state_descr (tBTM_PAIRING_STATE state) +static const char *btm_pair_state_descr (tBTM_PAIRING_STATE state) { -#if (BT_TRACE_VERBOSE == TRUE) switch (state) { case BTM_PAIR_STATE_IDLE: return("IDLE"); @@ -5876,12 +5875,6 @@ static char *btm_pair_state_descr (tBTM_PAIRING_STATE state) } return("???"); -#else - snprintf(btm_cb.state_temp_buffer, sizeof(btm_cb.state_temp_buffer), - "%hhu", state); - - return(btm_cb.state_temp_buffer); -#endif } /******************************************************************************* diff --git a/system/stack/l2cap/l2c_csm.cc b/system/stack/l2cap/l2c_csm.cc index fd504f09cc..a0b46aeedb 100644 --- a/system/stack/l2cap/l2c_csm.cc +++ b/system/stack/l2cap/l2c_csm.cc @@ -52,9 +52,7 @@ static void l2c_csm_open (tL2C_CCB *p_ccb, uint16_t event, void *p_data); static void l2c_csm_w4_l2cap_disconnect_rsp (tL2C_CCB *p_ccb, uint16_t event, void *p_data); static void l2c_csm_w4_l2ca_disconnect_rsp (tL2C_CCB *p_ccb, uint16_t event, void *p_data); -#if (BT_TRACE_VERBOSE == TRUE) -static char *l2c_csm_get_event_name (uint16_t event); -#endif +static const char *l2c_csm_get_event_name (uint16_t event); /******************************************************************************* ** @@ -136,11 +134,7 @@ static void l2c_csm_closed (tL2C_CCB *p_ccb, uint16_t event, void *p_data) if (p_ccb->p_rcb == NULL) { -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_ERROR ("L2CAP - LCID: 0x%04x st: CLOSED evt: %s p_rcb == NULL", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_ERROR ("L2CAP - LCID: 0x%04x st: CLOSED evt: 0x%04x p_rcb == NULL", p_ccb->local_cid, event); -#endif return; } @@ -159,11 +153,7 @@ static void l2c_csm_closed (tL2C_CCB *p_ccb, uint16_t event, void *p_data) disconnect_ind = p_ccb->p_rcb->api.pL2CA_DisconnectInd_Cb; connect_cfm = p_ccb->p_rcb->api.pL2CA_ConnectCfm_Cb; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: CLOSED evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: CLOSED evt: %d", event); -#endif switch (event) { @@ -335,11 +325,7 @@ static void l2c_csm_orig_w4_sec_comp (tL2C_CCB *p_ccb, uint16_t event, void *p_d tL2CA_CONNECT_CFM_CB *connect_cfm = p_ccb->p_rcb->api.pL2CA_ConnectCfm_Cb; uint16_t local_cid = p_ccb->local_cid; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: ORIG_W4_SEC_COMP evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: ORIG_W4_SEC_COMP evt: %d", event); -#endif #if (L2CAP_UCD_INCLUDED == TRUE) if ( local_cid == L2CAP_CONNECTIONLESS_CID ) @@ -449,11 +435,7 @@ static void l2c_csm_orig_w4_sec_comp (tL2C_CCB *p_ccb, uint16_t event, void *p_d *******************************************************************************/ static void l2c_csm_term_w4_sec_comp (tL2C_CCB *p_ccb, uint16_t event, void *p_data) { -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: TERM_W4_SEC_COMP evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: TERM_W4_SEC_COMP evt: %d", event); -#endif #if (L2CAP_UCD_INCLUDED == TRUE) if ( p_ccb->local_cid == L2CAP_CONNECTIONLESS_CID ) @@ -575,11 +557,7 @@ static void l2c_csm_w4_l2cap_connect_rsp (tL2C_CCB *p_ccb, uint16_t event, void tL2CA_CONNECT_CFM_CB *connect_cfm = p_ccb->p_rcb->api.pL2CA_ConnectCfm_Cb; uint16_t local_cid = p_ccb->local_cid; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: W4_L2CAP_CON_RSP evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: W4_L2CAP_CON_RSP evt: %d", event); -#endif switch (event) { @@ -712,11 +690,7 @@ static void l2c_csm_w4_l2ca_connect_rsp (tL2C_CCB *p_ccb, uint16_t event, void * tL2CA_DISCONNECT_IND_CB *disconnect_ind = p_ccb->p_rcb->api.pL2CA_DisconnectInd_Cb; uint16_t local_cid = p_ccb->local_cid; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: W4_L2CA_CON_RSP evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: W4_L2CA_CON_RSP evt: %d", event); -#endif switch (event) { @@ -831,11 +805,7 @@ static void l2c_csm_config (tL2C_CCB *p_ccb, uint16_t event, void *p_data) uint16_t local_cid = p_ccb->local_cid; uint8_t cfg_result; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: CONFIG evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: CONFIG evt: %d", event); -#endif switch (event) { @@ -1083,12 +1053,8 @@ static void l2c_csm_open (tL2C_CCB *p_ccb, uint16_t event, void *p_data) uint8_t cfg_result; uint16_t *credit; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: OPEN evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: OPEN evt: %d", event); -#endif #if (L2CAP_UCD_INCLUDED == TRUE) if ( local_cid == L2CAP_CONNECTIONLESS_CID ) @@ -1271,11 +1237,7 @@ static void l2c_csm_w4_l2cap_disconnect_rsp (tL2C_CCB *p_ccb, uint16_t event, vo tL2CA_DISCONNECT_CFM_CB *disconnect_cfm = p_ccb->p_rcb->api.pL2CA_DisconnectCfm_Cb; uint16_t local_cid = p_ccb->local_cid; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: W4_L2CAP_DISC_RSP evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: W4_L2CAP_DISC_RSP evt: %d", event); -#endif switch (event) { @@ -1336,11 +1298,7 @@ static void l2c_csm_w4_l2ca_disconnect_rsp (tL2C_CCB *p_ccb, uint16_t event, voi tL2CA_DISCONNECT_IND_CB *disconnect_ind = p_ccb->p_rcb->api.pL2CA_DisconnectInd_Cb; uint16_t local_cid = p_ccb->local_cid; -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP - LCID: 0x%04x st: W4_L2CA_DISC_RSP evt: %s", p_ccb->local_cid, l2c_csm_get_event_name (event)); -#else - L2CAP_TRACE_EVENT ("L2CAP - st: W4_L2CA_DISC_RSP evt: %d", event); -#endif switch (event) { @@ -1370,8 +1328,6 @@ static void l2c_csm_w4_l2ca_disconnect_rsp (tL2C_CCB *p_ccb, uint16_t event, voi } } - -#if (BT_TRACE_VERBOSE == TRUE) /******************************************************************************* ** ** Function l2c_csm_get_event_name @@ -1383,7 +1339,7 @@ static void l2c_csm_w4_l2ca_disconnect_rsp (tL2C_CCB *p_ccb, uint16_t event, voi ** Returns pointer to the name ** *******************************************************************************/ -static char *l2c_csm_get_event_name (uint16_t event) +static const char *l2c_csm_get_event_name (uint16_t event) { switch (event) { @@ -1465,8 +1421,6 @@ static char *l2c_csm_get_event_name (uint16_t event) return ("???? UNKNOWN EVENT"); } } -#endif /* (BT_TRACE_VERBOSE == TRUE) */ - /******************************************************************************* ** diff --git a/system/stack/l2cap/l2c_fcr.cc b/system/stack/l2cap/l2c_fcr.cc index 304886db79..fa222b1dc5 100644 --- a/system/stack/l2cap/l2c_fcr.cc +++ b/system/stack/l2cap/l2c_fcr.cc @@ -47,10 +47,8 @@ extern fixed_queue_t *btu_general_alarm_queue; /* this is the minimal offset required by OBX to process incoming packets */ static const uint16_t OBX_BUF_MIN_OFFSET = 4; -#if (BT_TRACE_VERBOSE == TRUE) -static char *SAR_types[] = { "Unsegmented", "Start", "End", "Continuation" }; -static char *SUP_types[] = { "RR", "REJ", "RNR", "SREJ" }; -#endif +static const char *SAR_types[] = { "Unsegmented", "Start", "End", "Continuation" }; +static const char *SUP_types[] = { "RR", "REJ", "RNR", "SREJ" }; /* Look-up table for the CRC calculation */ static const unsigned short crctab[256] = { @@ -463,7 +461,6 @@ static void prepare_I_frame (tL2C_CCB *p_ccb, BT_HDR *p_buf, bool is_retransm p_buf->len += L2CAP_FCS_LEN; } -#if (BT_TRACE_VERBOSE == TRUE) if (is_retransmission) { L2CAP_TRACE_EVENT ("L2CAP eRTM ReTx I-frame CID: 0x%04x Len: %u SAR: %s TxSeq: %u ReqSeq: %u F: %u", @@ -482,7 +479,6 @@ static void prepare_I_frame (tL2C_CCB *p_ccb, BT_HDR *p_buf, bool is_retransm (ctrl_word & L2CAP_FCR_REQ_SEQ_BITS) >> L2CAP_FCR_REQ_SEQ_BITS_SHIFT, (ctrl_word & L2CAP_FCR_F_BIT) >> L2CAP_FCR_F_BIT_SHIFT); } -#endif /* Start the retransmission timer if not already running */ if (p_ccb->peer_cfg.fcr.mode == L2CAP_FCR_ERTM_MODE) @@ -553,7 +549,6 @@ void l2c_fcr_send_S_frame (tL2C_CCB *p_ccb, uint16_t function_code, uint16_t pf_ p_buf->layer_specific = L2CAP_NON_FLUSHABLE_PKT; l2cu_set_acl_hci_header (p_buf, p_ccb); -#if (BT_TRACE_VERBOSE == TRUE) if ((((ctrl_word & L2CAP_FCR_SUP_BITS) >> L2CAP_FCR_SUP_SHIFT) == 1) || (((ctrl_word & L2CAP_FCR_SUP_BITS) >> L2CAP_FCR_SUP_SHIFT) == 3)) { L2CAP_TRACE_WARNING("L2CAP eRTM Tx S-frame CID: 0x%04x ctrlword: 0x%04x Type: %s ReqSeq: %u P: %u F: %u", @@ -572,7 +567,6 @@ void l2c_fcr_send_S_frame (tL2C_CCB *p_ccb, uint16_t function_code, uint16_t pf_ (ctrl_word & L2CAP_FCR_F_BIT) >> L2CAP_FCR_F_BIT_SHIFT); L2CAP_TRACE_EVENT(" Buf Len: %u", p_buf->len); } -#endif /* BT_TRACE_VERBOSE */ l2c_link_check_send_pkts (p_ccb->p_lcb, NULL, p_buf); @@ -618,7 +612,6 @@ void l2c_fcr_proc_pdu (tL2C_CCB *p_ccb, BT_HDR *p_buf) return; } -#if (BT_TRACE_VERBOSE == TRUE) /* Get the control word */ p = ((uint8_t *)(p_buf+1)) + p_buf->offset; STREAM_TO_UINT16 (ctrl_word, p); @@ -663,8 +656,6 @@ void l2c_fcr_proc_pdu (tL2C_CCB *p_ccb, BT_HDR *p_buf) fixed_queue_length(p_ccb->fcrb.waiting_for_ack_q), p_ccb->fcrb.num_tries); -#endif /* BT_TRACE_VERBOSE */ - /* Verify FCS if using */ if (p_ccb->bypass_fcs != L2CAP_BYPASS_FCS) { @@ -1380,14 +1371,12 @@ static void process_stream_frame (tL2C_CCB *p_ccb, BT_HDR *p_buf) return; } -#if (BT_TRACE_VERBOSE == TRUE) L2CAP_TRACE_EVENT ("L2CAP eRTM Rx I-frame: cid: 0x%04x Len: %u SAR: %-12s TxSeq: %u ReqSeq: %u F: %u", p_ccb->local_cid, p_buf->len, SAR_types[(ctrl_word & L2CAP_FCR_SAR_BITS) >> L2CAP_FCR_SAR_BITS_SHIFT], (ctrl_word & L2CAP_FCR_TX_SEQ_BITS) >> L2CAP_FCR_TX_SEQ_BITS_SHIFT, (ctrl_word & L2CAP_FCR_REQ_SEQ_BITS) >> L2CAP_FCR_REQ_SEQ_BITS_SHIFT, (ctrl_word & L2CAP_FCR_F_BIT) >> L2CAP_FCR_F_BIT_SHIFT); -#endif /* Extract the sequence number */ tx_seq = (ctrl_word & L2CAP_FCR_TX_SEQ_BITS) >> L2CAP_FCR_TX_SEQ_BITS_SHIFT; diff --git a/system/stack/mcap/mca_csm.cc b/system/stack/mcap/mca_csm.cc index c95b8e8f78..f80272383b 100644 --- a/system/stack/mcap/mca_csm.cc +++ b/system/stack/mcap/mca_csm.cc @@ -129,7 +129,6 @@ const tMCA_CCB_ST_TBL mca_ccb_st_tbl[] = { mca_ccb_st_closing }; -#if (BT_TRACE_VERBOSE == TRUE) /* verbose event strings for trace */ static const char * const mca_ccb_evt_str[] = { "API_CONNECT_EVT", @@ -151,7 +150,6 @@ static const char * const mca_ccb_st_str[] = { "OPEN_ST", "CLOSING_ST" }; -#endif /******************************************************************************* ** @@ -185,11 +183,7 @@ void mca_ccb_event(tMCA_CCB *p_ccb, uint8_t event, tMCA_CCB_EVT *p_data) tMCA_CCB_ST_TBL state_table; uint8_t action; -#if (BT_TRACE_VERBOSE == TRUE) MCA_TRACE_EVENT("CCB ccb=%d event=%s state=%s", mca_ccb_to_hdl(p_ccb), mca_ccb_evt_str[event], mca_ccb_st_str[p_ccb->state]); -#else - MCA_TRACE_EVENT("CCB ccb=%d event=%d state=%d", mca_ccb_to_hdl(p_ccb), event, p_ccb->state); -#endif /* look up the state table for the current state */ state_table = mca_ccb_st_tbl[p_ccb->state - 1]; diff --git a/system/stack/mcap/mca_dsm.cc b/system/stack/mcap/mca_dsm.cc index cc2aaa5891..57e3ae1062 100644 --- a/system/stack/mcap/mca_dsm.cc +++ b/system/stack/mcap/mca_dsm.cc @@ -104,7 +104,6 @@ const tMCA_DCB_ST_TBL mca_dcb_st_tbl[] = { mca_dcb_st_closing }; -#if (BT_TRACE_VERBOSE == TRUE) /* verbose event strings for trace */ const char * const mca_dcb_evt_str[] = { "API_CLOSE_EVT", @@ -121,7 +120,6 @@ const char * const mca_dcb_st_str[] = { "OPEN_ST", "CLOSING_ST" }; -#endif /******************************************************************************* ** @@ -141,11 +139,7 @@ void mca_dcb_event(tMCA_DCB *p_dcb, uint8_t event, tMCA_DCB_EVT *p_data) if (p_dcb == NULL) return; -#if (BT_TRACE_VERBOSE == TRUE) MCA_TRACE_EVENT("DCB dcb=%d event=%s state=%s", mca_dcb_to_hdl(p_dcb), mca_dcb_evt_str[event], mca_dcb_st_str[p_dcb->state]); -#else - MCA_TRACE_EVENT("DCB dcb=%d event=%d state=%d", mca_dcb_to_hdl(p_dcb), event, p_dcb->state); -#endif /* look up the state table for the current state */ state_table = mca_dcb_st_tbl[p_dcb->state - 1]; diff --git a/system/stack/sdp/sdp_db.cc b/system/stack/sdp/sdp_db.cc index 77e4fe4259..a4f640c7e7 100644 --- a/system/stack/sdp/sdp_db.cc +++ b/system/stack/sdp/sdp_db.cc @@ -399,7 +399,6 @@ bool SDP_AddAttribute (uint32_t handle, uint16_t attr_id, uint8_t attr_type, uint16_t xx, yy, zz; tSDP_RECORD *p_rec = &sdp_cb.server_db.record[0]; -#if (BT_TRACE_VERBOSE == TRUE) if (sdp_cb.trace_level >= BT_TRACE_LEVEL_DEBUG) { if ((attr_type == UINT_DESC_TYPE) || @@ -420,7 +419,7 @@ bool SDP_AddAttribute (uint32_t handle, uint16_t attr_id, uint8_t attr_type, SDP_TRACE_DEBUG("SDP_AddAttribute: handle:%X, id:%04X, type:%d, len:%d, p_val:%p, *p_val:%s", handle,attr_id,attr_type,attr_len,p_val,num_array); } - else if (attr_type == bool _DESC_TYPE) + else if (attr_type == BOOLEAN_DESC_TYPE) { SDP_TRACE_DEBUG("SDP_AddAttribute: handle:%X, id:%04X, type:%d, len:%d, p_val:%p, *p_val:%d", handle,attr_id,attr_type,attr_len,p_val,*p_val); @@ -431,7 +430,6 @@ bool SDP_AddAttribute (uint32_t handle, uint16_t attr_id, uint8_t attr_type, handle,attr_id,attr_type,attr_len,p_val,p_val); } } -#endif /* Find the record in the database */ for (zz = 0; zz < sdp_cb.server_db.num_records; zz++, p_rec++) |