From af7b39e595cf9198377539136eebd4dffffda3a7 Mon Sep 17 00:00:00 2001 From: Marie Janssen Date: Mon, 10 Oct 2016 09:49:14 -0700 Subject: [PATCH] stack: remove dead (#if 0'd) code Test: compiles Change-Id: I34f68c2b166a28622155358ff75478af8d18bed0 --- stack/avdt/avdt_scb_act.c | 5 ----- stack/btm/btm_acl.c | 7 ------- stack/btm/btm_devctl.c | 4 ---- stack/btm/btm_inq.c | 3 --- stack/btm/btm_sco.c | 4 ---- stack/include/hcidefs.h | 11 ----------- stack/pan/pan_utils.c | 5 ----- stack/smp/smp_cmac.c | 46 ---------------------------------------------- 8 files changed, 85 deletions(-) diff --git a/stack/avdt/avdt_scb_act.c b/stack/avdt/avdt_scb_act.c index 6c774e6a3..023f3075f 100644 --- a/stack/avdt/avdt_scb_act.c +++ b/stack/avdt/avdt_scb_act.c @@ -1986,11 +1986,6 @@ void avdt_scb_chk_snd_pkt(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data) #if (AVDT_MULTIPLEXING == TRUE) else { -#if 0 - AVDT_TRACE_DEBUG("num_q=%d", - L2CA_FlushChannel(avdt_cb.ad.rt_tbl[avdt_ccb_to_idx(p_scb->p_ccb)][avdt_ad_type_to_tcid(AVDT_CHAN_MEDIA, p_scb)].lcid), - L2CAP_FLUSH_CHANS_GET); -#endif while ((p_pkt = (BT_HDR*)fixed_queue_try_dequeue(p_scb->frag_q)) != NULL) { sent = true; diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c index 20e145140..f70c18fc6 100644 --- a/stack/btm/btm_acl.c +++ b/stack/btm/btm_acl.c @@ -70,13 +70,6 @@ static void btm_process_remote_ext_features (tACL_CONN *p_acl_cb, uint8_t num_re void btm_acl_init (void) { BTM_TRACE_DEBUG ("btm_acl_init"); -#if 0 /* cleared in btm_init; put back in if called from anywhere else! */ - memset (&btm_cb.acl_db, 0, sizeof (btm_cb.acl_db)); - memset (btm_cb.btm_scn, 0, BTM_MAX_SCN); /* Initialize the SCN usage to false */ - btm_cb.btm_def_link_policy = 0; - btm_cb.p_bl_changed_cb = NULL; -#endif - /* Initialize nonzero defaults */ btm_cb.btm_def_link_super_tout = HCI_DEFAULT_INACT_TOUT; btm_cb.acl_disc_reason = 0xff ; diff --git a/stack/btm/btm_devctl.c b/stack/btm/btm_devctl.c index aca88e9bb..9dd03f678 100644 --- a/stack/btm/btm_devctl.c +++ b/stack/btm/btm_devctl.c @@ -77,10 +77,6 @@ static void btm_decode_ext_features_page (uint8_t page_number, const BD_FEATURES *******************************************************************************/ void btm_dev_init (void) { -#if 0 /* cleared in btm_init; put back in if called from anywhere else! */ - memset (&btm_cb.devcb, 0, sizeof (tBTM_DEVCB)); -#endif - /* Initialize nonzero defaults */ memset(btm_cb.cfg.bd_name, 0, sizeof(tBTM_LOC_BD_NAME)); diff --git a/stack/btm/btm_inq.c b/stack/btm/btm_inq.c index 11870e01e..adb06a8d8 100644 --- a/stack/btm/btm_inq.c +++ b/stack/btm/btm_inq.c @@ -1344,9 +1344,6 @@ void btm_inq_db_reset (void) *******************************************************************************/ void btm_inq_db_init (void) { -#if 0 /* cleared in btm_init; put back in if called from anywhere else! */ - memset (&btm_cb.btm_inq_vars, 0, sizeof (tBTM_INQUIRY_VAR_ST)); -#endif alarm_free(btm_cb.btm_inq_vars.remote_name_timer); btm_cb.btm_inq_vars.remote_name_timer = alarm_new("btm_inq.remote_name_timer"); diff --git a/stack/btm/btm_sco.c b/stack/btm/btm_sco.c index 994e9df7b..c2cc10a25 100644 --- a/stack/btm/btm_sco.c +++ b/stack/btm/btm_sco.c @@ -113,10 +113,6 @@ void btm_sco_flush_sco_data(uint16_t sco_inx) *******************************************************************************/ void btm_sco_init (void) { -#if 0 /* cleared in btm_init; put back in if called from anywhere else! */ - memset (&btm_cb.sco_cb, 0, sizeof(tSCO_CB)); -#endif - #if (BTM_SCO_HCI_INCLUDED == TRUE) for (int i = 0; i < BTM_MAX_SCO_LINKS; i++) btm_cb.sco_cb.sco_db[i].xmit_data_q = fixed_queue_new(SIZE_MAX); diff --git a/stack/include/hcidefs.h b/stack/include/hcidefs.h index e8f012bf1..2e5282d05 100644 --- a/stack/include/hcidefs.h +++ b/stack/include/hcidefs.h @@ -1591,7 +1591,6 @@ typedef struct #define HCI_FEATURE_AFH_CLASS_SLAVE_OFF 4 #define HCI_LMP_AFH_CLASS_SLAVE_SUPPORTED(x) ((x)[HCI_FEATURE_AFH_CLASS_SLAVE_OFF] & HCI_FEATURE_AFH_CLASS_SLAVE_MASK) -#if 1 #define HCI_FEATURE_BREDR_NOT_SPT_MASK 0x20 #define HCI_FEATURE_BREDR_NOT_SPT_OFF 4 #define HCI_BREDR_NOT_SPT_SUPPORTED(x) ((x)[HCI_FEATURE_BREDR_NOT_SPT_OFF] & HCI_FEATURE_BREDR_NOT_SPT_MASK) @@ -1599,16 +1598,6 @@ typedef struct #define HCI_FEATURE_LE_SPT_MASK 0x40 #define HCI_FEATURE_LE_SPT_OFF 4 #define HCI_LE_SPT_SUPPORTED(x) ((x)[HCI_FEATURE_LE_SPT_OFF] & HCI_FEATURE_LE_SPT_MASK) -#else - -#define HCI_FEATURE_ALIAS_AUTH_MASK 0x20 -#define HCI_FEATURE_ALIAS_AUTH_OFF 4 -#define HCI_LMP_ALIAS_AUTH_SUPPORTED(x) ((x)[HCI_FEATURE_ALIAS_AUTH_OFF] & HCI_FEATURE_ALIAS_AUTH_MASK) - -#define HCI_FEATURE_ANON_MODE_MASK 0x40 -#define HCI_FEATURE_ANON_MODE_OFF 4 -#define HCI_LMP_ANON_MODE_SUPPORTED(x) ((x)[HCI_FEATURE_ANON_MODE_OFF] & HCI_FEATURE_ANON_MODE_MASK) -#endif #define HCI_FEATURE_3_SLOT_EDR_ACL_MASK 0x80 #define HCI_FEATURE_3_SLOT_EDR_ACL_OFF 4 diff --git a/stack/pan/pan_utils.c b/stack/pan/pan_utils.c index 54fd524cf..fe578f038 100644 --- a/stack/pan/pan_utils.c +++ b/stack/pan/pan_utils.c @@ -81,11 +81,6 @@ uint32_t pan_register_with_sdp (uint16_t uuid, uint8_t sec_mask, char *p_name, c SDP_AddAttribute (sdp_handle, ATTR_ID_PROTOCOL_DESC_LIST, DATA_ELE_SEQ_DESC_TYPE, proto_len, (uint8_t *)(pan_proto_elem_data+2)); -#if 0 - availability = 0xFF; - SDP_AddAttribute (sdp_handle, ATTR_ID_SERVICE_AVAILABILITY, UINT_DESC_TYPE, 1, &availability); -#endif - /* Language base */ SDP_AddLanguageBaseAttrIDList (sdp_handle, LANG_ID_CODE_ENGLISH, LANG_ID_CHAR_ENCODE_UTF8, LANGUAGE_BASE_ID); diff --git a/stack/smp/smp_cmac.c b/stack/smp/smp_cmac.c index 7224a1828..30beb7b11 100644 --- a/stack/smp/smp_cmac.c +++ b/stack/smp/smp_cmac.c @@ -324,51 +324,5 @@ bool aes_cipher_msg_auth_code(BT_OCTET16 key, uint8_t *input, uint16_t length return ret; } - #if 0 /* testing code, sample data from spec */ -void test_cmac_cback(uint8_t *p_mac, uint16_t tlen) -{ - SMP_TRACE_EVENT ("test_cmac_cback "); - SMP_TRACE_ERROR("test_cmac_cback"); -} - -void test_cmac(void) -{ - SMP_TRACE_EVENT ("test_cmac "); - uint8_t M[64] = { - 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, - 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, - 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, - 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, - 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, - 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, - 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, - 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 - }; - - uint8_t key[16] = { - 0x3c, 0x4f, 0xcf, 0x09, 0x88, 0x15, 0xf7, 0xab, - 0xa6, 0xd2, 0xae, 0x28, 0x16, 0x15, 0x7e, 0x2b - }; - uint8_t i =0, tmp; - uint16_t len; - - len = 64; - - for (i = 0; i < len/2; i ++) - { - tmp = M[i]; - M[i] = M[len -1 - i]; - M[len -1 - i] = tmp; - } - - - memset(&cmac_cb, 0, sizeof(tCMAC_CB)); - - SMP_TRACE_WARNING("\n Example 1: len = %d\n", len); - - aes_cipher_msg_auth_code(key, M, len, 128, test_cmac_cback, 0); - -} - #endif #endif -- 2.11.0