Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_ble_scan_5min_stop_github_#12723' into 'master'

Browse source 
component/bt: Change the duration type from UINT8 to UINT32

See merge request !815
This commit is contained in:
Jiang Jiang Jian 2017-06-06 14:11:05 +08:00
parent 7ea33771c7 a42bf640bc
commit b0d93fccce
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/bt/bluedroid/bta/dm/bta_dm_api.c
View file

@ -2127,7 +2127,7 @@ void BTA_DmCloseACL(BD_ADDR bd_addr, BOOLEAN remove_dev, tBTA_TRANSPORT transpor
** Returns void. ** Returns void.
** **
*******************************************************************************/ *******************************************************************************/
extern void BTA_DmBleObserve(BOOLEAN start, UINT8 duration, extern void BTA_DmBleObserve(BOOLEAN start, UINT32 duration,
tBTA_DM_SEARCH_CBACK *p_results_cb, tBTA_DM_SEARCH_CBACK *p_results_cb,
tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb) tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb)
{ {

2
components/bt/bluedroid/bta/dm/bta_dm_int.h
View file

@ -478,7 +478,7 @@ typedef struct {
typedef struct { typedef struct {
BT_HDR hdr; BT_HDR hdr;
BOOLEAN start; BOOLEAN start;
UINT16 duration; UINT32 duration;
tBTA_DM_SEARCH_CBACK *p_cback; tBTA_DM_SEARCH_CBACK *p_cback;
tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_scan_cback; tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_scan_cback;
tBTA_START_STOP_SCAN_CMPL_CBACK *p_stop_scan_cback; tBTA_START_STOP_SCAN_CMPL_CBACK *p_stop_scan_cback;

2
components/bt/bluedroid/bta/include/bta_api.h
View file

@ -2010,7 +2010,7 @@ extern void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport,
** Returns void ** Returns void
** **
*******************************************************************************/ *******************************************************************************/
extern void BTA_DmBleObserve(BOOLEAN start, UINT8 duration, extern void BTA_DmBleObserve(BOOLEAN start, UINT32 duration,
tBTA_DM_SEARCH_CBACK *p_results_cb, tBTA_DM_SEARCH_CBACK *p_results_cb,
tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb); tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb);

2
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
View file

@ -580,7 +580,7 @@ static void btc_set_encryption_callback(BD_ADDR bd_addr, tBTA_TRANSPORT transpor
} }
#endif ///SMP_INCLUDED == TRUE #endif ///SMP_INCLUDED == TRUE
static void btc_ble_start_scanning(uint8_t duration, static void btc_ble_start_scanning(uint32_t duration,
tBTA_DM_SEARCH_CBACK *results_cb, tBTA_DM_SEARCH_CBACK *results_cb,
tBTA_START_STOP_SCAN_CMPL_CBACK *start_scan_cb) tBTA_START_STOP_SCAN_CMPL_CBACK *start_scan_cb)
{ {

2
components/bt/bluedroid/stack/btm/btm_ble_gap.c
View file

@ -341,7 +341,7 @@ BOOLEAN btm_ble_send_extended_scan_params(UINT8 scan_type, UINT32 scan_int,
** Returns void ** Returns void
** **
*******************************************************************************/ *******************************************************************************/
tBTM_STATUS BTM_BleObserve(BOOLEAN start, UINT8 duration, tBTM_STATUS BTM_BleObserve(BOOLEAN start, UINT32 duration,
tBTM_INQ_RESULTS_CB *p_results_cb, tBTM_CMPL_CB *p_cmpl_cb) tBTM_INQ_RESULTS_CB *p_results_cb, tBTM_CMPL_CB *p_cmpl_cb)
{ {
tBTM_BLE_INQ_CB *p_inq = &btm_cb.ble_ctr_cb.inq_var; tBTM_BLE_INQ_CB *p_inq = &btm_cb.ble_ctr_cb.inq_var;

2
components/bt/bluedroid/stack/include/btm_ble_api.h
View file

@ -1191,7 +1191,7 @@ tBTM_STATUS BTM_BleWriteScanRspRaw(UINT8 *p_raw_scan_rsp, UINT32 raw_scan_rsp_le
** **
*******************************************************************************/ *******************************************************************************/
//extern //extern
tBTM_STATUS BTM_BleObserve(BOOLEAN start, UINT8 duration, tBTM_STATUS BTM_BleObserve(BOOLEAN start, UINT32 duration,
tBTM_INQ_RESULTS_CB *p_results_cb, tBTM_CMPL_CB *p_cmpl_cb); tBTM_INQ_RESULTS_CB *p_results_cb, tBTM_CMPL_CB *p_cmpl_cb);