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

Commit e391f7c2 authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Fix more BLE_INCLUDED == FALSE build breakage 

Change-Id: I2da6dcdaced78d3a3bce6002fc3885c7480fba82
parent 9bfbabbe

system/bta/dm/bta_dm_act.c

+3 −1
Original line number Diff line number Diff line
@@ -662,9 +662,10 @@ void bta_dm_remove_device(tBTA_DM_MSG *p_data) 
        continue_delete_dev = TRUE;

    }



    BOOLEAN continue_delete_other_dev = FALSE;

#if BLE_INCLUDED == TRUE

    // If it is DUMO device and device is paired as different address, unpair that device

    // if different address

    BOOLEAN continue_delete_other_dev = FALSE;

    if ((other_transport && (BTM_ReadConnectedTransportAddress(other_address, other_transport))) ||

      (!other_transport && (BTM_ReadConnectedTransportAddress(other_address, BT_TRANSPORT_BR_EDR) ||

       BTM_ReadConnectedTransportAddress(other_address, BT_TRANSPORT_LE))))
@@ -682,6 +683,7 @@ void bta_dm_remove_device(tBTA_DM_MSG *p_data) 
        }

    }

    else

#endif

    {

        APPL_TRACE_DEBUG("%s: continue to delete the other dev ", __func__);

        continue_delete_other_dev = TRUE;

system/bta/dm/bta_dm_api.c

+5 −2
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ void BTA_DmSetBlePrefConnParams(BD_ADDR bd_addr, 
*******************************************************************************/

void BTA_DmSetBleConnScanParams(UINT32 scan_interval, UINT32 scan_window)

{

#if BLE_INCLUDED == TRUE

    tBTA_DM_API_BLE_SCAN_PARAMS  *p_msg;

    if ((p_msg = (tBTA_DM_API_BLE_SCAN_PARAMS *)GKI_getbuf(sizeof(tBTA_DM_API_BLE_SCAN_PARAMS))) != NULL)

    {
@@ -914,8 +915,10 @@ void BTA_DmSetBleConnScanParams(UINT32 scan_interval, UINT32 scan_window) 
        p_msg->scan_window      = scan_window;

        bta_sys_sendmsg(p_msg);

    }

#endif

}



#if BLE_INCLUDED == TRUE

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

**

** Function         BTA_DmSetBleScanParams
@@ -966,7 +969,6 @@ void BTA_DmSetBleScanParams(tGATT_IF client_if, UINT32 scan_interval, 
void BTA_DmSetBleAdvParams (UINT16 adv_int_min, UINT16 adv_int_max,

                           tBLE_BD_ADDR *p_dir_bda)

{

#if BLE_INCLUDED == TRUE

    tBTA_DM_API_BLE_ADV_PARAMS    *p_msg;



    APPL_TRACE_API ("BTA_DmSetBleAdvParam: %d, %d", adv_int_min, adv_int_max);
@@ -988,8 +990,9 @@ void BTA_DmSetBleAdvParams (UINT16 adv_int_min, UINT16 adv_int_max, 


        bta_sys_sendmsg(p_msg);

    }

#endif

}

#endif



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

**                      BLE ADV data management API

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

system/btif/src/btif_storage.c

+2 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ static void btif_read_le_key(const uint8_t key_type, const size_t key_len, bt_bd 
    char buffer[100];

    memset(buffer, 0, sizeof(buffer));



#if (BLE_INCLUDED == TRUE)

    if (btif_storage_get_ble_bonding_key(&bd_addr, key_type, buffer, key_len) == BT_STATUS_SUCCESS)

    {

        if (add_key)
@@ -576,6 +577,7 @@ static void btif_read_le_key(const uint8_t key_type, const size_t key_len, bt_bd 


        *key_found = true;

    }

#endif

}



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