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

Commit 062581ce authored by Prashant Malani's avatar Prashant Malani Committed by Andre Eisenbach
Browse files

Fix miscellaneous compilation errors 

- Move variables within #defines to avoid unused errors.
- Place #define's correctly to avoid unused function errors.
- Correct parameter passed into a function.

Bug: 27336841
Change-Id: I7c2ab24b3bd3725d126c90483473af83b88687a2
parent 72078893

system/btif/src/btif_gatt_util.c

+6 −3
Original line number Diff line number Diff line
@@ -282,8 +282,7 @@ uint16_t set_read_value(btgatt_read_params_t *p_dest, tBTA_GATTC_READ *p_src) 
 * Encrypted link map handling

 *******************************************************************************/



static void btif_gatt_set_encryption_cb (BD_ADDR bd_addr, tBTA_TRANSPORT transport, tBTA_STATUS result);



#if (!defined(BLE_DELAY_REQUEST_ENC) || (BLE_DELAY_REQUEST_ENC == FALSE))

static BOOLEAN btif_gatt_is_link_encrypted (BD_ADDR bd_addr)

{

    if (bd_addr == NULL)
@@ -302,15 +301,16 @@ static void btif_gatt_set_encryption_cb (BD_ADDR bd_addr, tBTA_TRANSPORT transpo 
        BTIF_TRACE_WARNING("%s() - Encryption failed (%d)", __FUNCTION__, result);

    }

}

#endif



void btif_gatt_check_encrypted_link (BD_ADDR bd_addr, tBTA_GATT_TRANSPORT transport_link)

{

#if (!defined(BLE_DELAY_REQUEST_ENC) || (BLE_DELAY_REQUEST_ENC == FALSE))

    char buf[100];



    bt_bdaddr_t bda;

    bdcpy(bda.address, bd_addr);



#if (!defined(BLE_DELAY_REQUEST_ENC) || (BLE_DELAY_REQUEST_ENC == FALSE))

    if ((btif_storage_get_ble_bonding_key(&bda, BTIF_DM_LE_KEY_PENC,

                    buf, sizeof(tBTM_LE_PENC_KEYS)) == BT_STATUS_SUCCESS)

        && !btif_gatt_is_link_encrypted(bd_addr))
@@ -319,6 +319,9 @@ void btif_gatt_check_encrypted_link (BD_ADDR bd_addr, tBTA_GATT_TRANSPORT transp 
        BTA_DmSetEncryption(bd_addr,transport_link,

                            &btif_gatt_set_encryption_cb, BTM_BLE_SEC_ENCRYPT);

    }

#else

    UNUSED(bd_addr);

    UNUSED(transport_link);

#endif

}

system/btif/src/btif_rc.c

+10 −2
Original line number Diff line number Diff line
@@ -240,14 +240,18 @@ static void send_reject_response (UINT8 rc_handle, UINT8 label, 
static UINT8 opcode_from_pdu(UINT8 pdu);

static void send_metamsg_rsp (UINT8 rc_handle, UINT8 label,

    tBTA_AV_CODE code, tAVRC_RESPONSE *pmetamsg_resp);

#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

static void register_volumechange(UINT8 label);

#endif

static void lbl_init();

static void lbl_destroy();

static void init_all_transactions();

static bt_status_t  get_transaction(rc_transaction_t **ptransaction);

static void release_transaction(UINT8 label);

static rc_transaction_t* get_transaction_by_lbl(UINT8 label);

#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

static void handle_rc_metamsg_rsp(tBTA_AV_META_MSG *pmeta_msg);

#endif

#if (AVRC_CTLR_INCLUDED == TRUE)

static void handle_avk_rc_metamsg_cmd(tBTA_AV_META_MSG *pmeta_msg);

static void handle_avk_rc_metamsg_rsp(tBTA_AV_META_MSG *pmeta_msg);
@@ -276,7 +280,9 @@ static bt_status_t list_player_app_setting_value_cmd(uint8_t attrib_id); 
static bt_status_t get_player_app_setting_cmd(uint8_t num_attrib, uint8_t* attrib_ids);

#endif

static void btif_rc_upstreams_evt(UINT16 event, tAVRC_COMMAND* p_param, UINT8 ctype, UINT8 label);

#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

static void btif_rc_upstreams_rsp_evt(UINT16 event, tAVRC_RESPONSE *pavrc_resp, UINT8 ctype, UINT8 label);

#endif

static void rc_start_play_status_timer(void);

static bool absolute_volume_disabled(void);
@@ -1513,6 +1519,7 @@ static void btif_rc_ctrl_upstreams_rsp_cmd(UINT8 event, tAVRC_COMMAND *pavrc_cmd 
}

#endif



#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

/*******************************************************************************

**

** Function         btif_rc_upstreams_rsp_evt
@@ -1527,7 +1534,6 @@ static void btif_rc_upstreams_rsp_evt(UINT16 event, tAVRC_RESPONSE *pavrc_resp, 
    BTIF_TRACE_EVENT("%s pdu: %s handle: 0x%x ctype:%x label:%x", __FUNCTION__,

        dump_rc_pdu(pavrc_resp->pdu), btif_rc_cb.rc_handle, ctype, label);



#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

    switch (event)

    {

        case AVRC_PDU_REGISTER_NOTIFICATION:
@@ -1551,8 +1557,8 @@ static void btif_rc_upstreams_rsp_evt(UINT16 event, tAVRC_RESPONSE *pavrc_resp, 
        default:

            return;

    }

#endif

}

#endif



/************************************************************************************

**  AVRCP API Functions
@@ -1825,6 +1831,7 @@ static bt_status_t set_volume(uint8_t volume) 
    return status;

}



#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

/***************************************************************************

**

** Function         register_volumechange
@@ -1942,6 +1949,7 @@ static void handle_rc_metamsg_rsp(tBTA_AV_META_MSG *pmeta_msg) 
     btif_rc_upstreams_rsp_evt((uint16_t)avrc_response.rsp.pdu, &avrc_response, pmeta_msg->code,

                                pmeta_msg->label);

}

#endif



#if (AVRC_CTLR_INCLUDED == TRUE)

/***************************************************************************

system/stack/avrc/avrc_pars_ct.c

+4 −0
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ static tAVRC_STS avrc_pars_vendor_rsp(tAVRC_MSG_VENDOR *p_msg, tAVRC_RESPONSE *p 
    tAVRC_STS  status = AVRC_STS_NO_ERROR;

    UINT8   *p;

    UINT16  len;

#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

    UINT8 eventid=0;

#endif



    /* Check the vendor data */

    if (p_msg->vendor_len == 0)
@@ -392,9 +394,11 @@ tAVRC_STS AVRC_Ctrl_ParsResponse (tAVRC_MSG *p_msg, tAVRC_RESPONSE *p_result, UI 
    {

        switch (p_msg->hdr.opcode)

        {

#if (AVRC_ADV_CTRL_INCLUDED == TRUE)

        case AVRC_OP_VENDOR:     /*  0x00    Vendor-dependent commands */

            status = avrc_ctrl_pars_vendor_rsp(&p_msg->vendor, p_result, p_buf,buf_len);

            break;

#endif



        default:

            AVRC_TRACE_ERROR("%s unknown opcode:0x%x", __func__, p_msg->hdr.opcode);

system/stack/gatt/gatt_db.c

+3 −9
Original line number Diff line number Diff line
@@ -336,9 +336,6 @@ tGATT_STATUS gatts_db_read_attr_value_by_type (tGATT_TCB *p_tcb, 
    UINT16      len = 0;

    UINT8       *p = (UINT8 *)(p_rsp + 1) + p_rsp->len + L2CAP_MIN_OFFSET;

    tBT_UUID    attr_uuid;

#if (defined(BLE_DELAY_REQUEST_ENC) && (BLE_DELAY_REQUEST_ENC == TRUE))

    UINT8       flag;

#endif



    if (p_db && p_db->p_attr_list)

    {
@@ -409,6 +406,7 @@ tGATT_STATUS gatts_db_read_attr_value_by_type (tGATT_TCB *p_tcb, 
    }



#if (defined(BLE_DELAY_REQUEST_ENC) && (BLE_DELAY_REQUEST_ENC == TRUE))

    UINT8 flag = 0;

    if (BTM_GetSecurityFlags(p_tcb->peer_bda, &flag))

    {

        if ((p_tcb->att_lcid == L2CAP_ATT_CID) && (status == GATT_PENDING) &&
@@ -417,13 +415,9 @@ tGATT_STATUS gatts_db_read_attr_value_by_type (tGATT_TCB *p_tcb, 
            if ((flag & (BTM_SEC_LINK_KEY_KNOWN | BTM_SEC_FLAG_ENCRYPTED)) ==

                 BTM_SEC_LINK_KEY_KNOWN)

            {

                tACL_CONN         *p;

                p = btm_bda_to_acl(p_tcb->peer_bda, BT_TRANSPORT_LE);

                tACL_CONN *p = btm_bda_to_acl(p_tcb->peer_bda, BT_TRANSPORT_LE);

                if ((p != NULL) && (p->link_role == BTM_ROLE_MASTER))

                {

                    tBTM_BLE_SEC_ACT sec_act = BTM_BLE_SEC_ENCRYPT;

                    btm_ble_set_encryption(p_tcb->peer_bda, &sec_act, p->link_role);

                }

                    btm_ble_set_encryption(p_tcb->peer_bda, BTM_BLE_SEC_ENCRYPT, p->link_role);

            }

        }

    }