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

Commit 72ef4243 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Wei Wang
Browse files

LE: Add service UUIDs and data to advertising data 

Add support for UUIDs and custom service data in the advertising and
scan response records.

Change-Id: I6470427ad194871488cc90f3ab384b9ecf326b15
parent 6a4f4c14

system/bta/dm/bta_dm_act.c

+29 −0
Original line number Diff line number Diff line
@@ -5017,6 +5017,7 @@ void bta_dm_ble_set_adv_params (tBTA_DM_MSG *p_data) 
                        p_data->ble_set_adv_params.p_dir_bda,

                        BTA_DM_BLE_ADV_CHNL_MAP);

}



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

**

** Function         bta_dm_ble_set_adv_config
@@ -5032,6 +5033,34 @@ void bta_dm_ble_set_adv_config (tBTA_DM_MSG *p_data) 
                        (tBTM_BLE_ADV_DATA *)p_data->ble_set_adv_data.p_adv_cfg);

}



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

**

** Function         bta_dm_ble_set_scan_rsp

**

** Description      This function set the customized ADV scan resp. configuration

**

** Parameters:

**

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

void bta_dm_ble_set_scan_rsp (tBTA_DM_MSG *p_data)

{

    BTM_BleWriteScanRsp(p_data->ble_set_adv_data.data_mask,

                        (tBTM_BLE_ADV_DATA *)p_data->ble_set_adv_data.p_adv_cfg);

}



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

**

** Function         bta_dm_ble_broadcast

**

** Description      Starts or stops LE broadcasts

**

** Parameters:

**

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

void bta_dm_ble_broadcast (tBTA_DM_MSG *p_data)

{

    BTM_BleBroadcast(p_data->ble_observe.start);

}



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

#ifndef BTA_DM_GATT_CLOSE_DELAY_TOUT

system/bta/dm/bta_dm_api.c

+54 −0
Original line number Diff line number Diff line
@@ -1510,6 +1510,60 @@ void BTA_DmBleSetAdvConfig (tBTA_BLE_AD_MASK data_mask, tBTA_BLE_ADV_DATA *p_adv 
        bta_sys_sendmsg(p_msg);

    }

}



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

**

** Function         BTA_DmBleSetScanRsp

**

** Description      This function is called to override the BTA scan response.

**

** Parameters       Pointer to User defined ADV data structure

**

** Returns          None

**

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

BTA_API extern void BTA_DmBleSetScanRsp (tBTA_BLE_AD_MASK data_mask, tBTA_BLE_ADV_DATA *p_adv_cfg)

{

    tBTA_DM_API_SET_ADV_CONFIG  *p_msg;



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

    {

        p_msg->hdr.event = BTA_DM_API_BLE_SET_SCAN_RSP_EVT;

		p_msg->data_mask = data_mask;

        p_msg->p_adv_cfg = p_adv_cfg;



        bta_sys_sendmsg(p_msg);

    }

}



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

**

** Function         BTA_DmBleBroadcast

**

** Description      This function starts or stops LE broadcasting.

**

** Parameters       start: start or stop broadcast.

**

** Returns          None

**

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

BTA_API extern void BTA_DmBleBroadcast (BOOLEAN start)

{

    tBTA_DM_API_BLE_OBSERVE   *p_msg;



    APPL_TRACE_API1("BTA_DmBleBroadcast: start = %d ", start);



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

    {

        memset(p_msg, 0, sizeof(tBTA_DM_API_BLE_OBSERVE));



        p_msg->hdr.event = BTA_DM_API_BLE_BROADCAST_EVT;

        p_msg->start = start;



        bta_sys_sendmsg(p_msg);

    }

}



#endif

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

**

system/bta/dm/bta_dm_int.h

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ enum 
    BTA_DM_API_BLE_OBSERVE_EVT,

    BTA_DM_API_BLE_ADV_PARAM_EVT,

    BTA_DM_API_BLE_SET_ADV_CONFIG_EVT,

    BTA_DM_API_BLE_SET_SCAN_RSP_EVT,

    BTA_DM_API_BLE_BROADCAST_EVT,

#endif



#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
@@ -996,6 +998,8 @@ extern void bta_dm_close_gatt_conn(tBTA_DM_MSG *p_data); 
extern void bta_dm_ble_observe (tBTA_DM_MSG *p_data);

extern void bta_dm_ble_set_adv_params (tBTA_DM_MSG *p_data);

extern void bta_dm_ble_set_adv_config (tBTA_DM_MSG *p_data);

extern void bta_dm_ble_set_scan_rsp (tBTA_DM_MSG *p_data);

extern void bta_dm_ble_broadcast (tBTA_DM_MSG *p_data);



#endif

extern void bta_dm_set_encryption(tBTA_DM_MSG *p_data);

system/bta/dm/bta_dm_main.c

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ const tBTA_DM_ACTION bta_dm_action[] = 
    bta_dm_ble_observe,

    bta_dm_ble_set_adv_params,     /* BTA_DM_API_BLE_SCAN_PARAM_EVT */

    bta_dm_ble_set_adv_config,     /* BTA_DM_API_BLE_SET_ADV_CONFIG_EVT */

    bta_dm_ble_set_scan_rsp,       /* BTA_DM_API_BLE_SET_SCAN_RSP_EVT */

    bta_dm_ble_broadcast,          /* BTA_DM_API_BLE_BROADCAST_EVT */

#endif



#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)

system/bta/include/bta_api.h

+29 −1
Original line number Diff line number Diff line
@@ -1884,7 +1884,7 @@ BTA_API extern void BTA_DmBleObserve(BOOLEAN start, UINT8 duration, 
*******************************************************************************/

BTA_API extern void BTA_DmSetAfhChannelAssessment (BOOLEAN enable_or_disable);



#if BLE_INCLUDE == TRUE

#if BLE_INCLUDED == TRUE

// btla-specific --

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

**
@@ -1927,6 +1927,34 @@ BTA_API extern void BTA_DmBleEnableRemotePrivacy(BD_ADDR bd_addr, BOOLEAN privac 
*******************************************************************************/

BTA_API extern void BTA_DmBleSetAdvConfig (tBTA_BLE_AD_MASK data_mask,

                                           tBTA_BLE_ADV_DATA *p_adv_cfg);



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

**

** Function         BTA_DmBleSetScanRsp

**

** Description      This function is called to override the BTA scan response.

**

** Parameters       Pointer to User defined ADV data structure

**

** Returns          None

**

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

BTA_API extern void BTA_DmBleSetScanRsp (tBTA_BLE_AD_MASK data_mask,

                                         tBTA_BLE_ADV_DATA *p_adv_cfg);



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

**

** Function         BTA_DmBleBroadcast

**

** Description      This function starts or stops LE broadcasting.

**

** Parameters       start: start or stop broadcast.

**

** Returns          None

**

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

BTA_API extern void BTA_DmBleBroadcast (BOOLEAN start);



#endif



#ifdef __cplusplus