From a42bf640bc469ef5d04802f7da409cd43e392b84 Mon Sep 17 00:00:00 2001 From: Yulong Date: Sat, 3 Jun 2017 01:00:10 -0400 Subject: [PATCH] component/bt: Change the duration type from UINT8 to UINT32 --- components/bt/bluedroid/bta/dm/bta_dm_api.c | 2 +- components/bt/bluedroid/bta/dm/bta_dm_int.h | 2 +- components/bt/bluedroid/bta/include/bta_api.h | 2 +- components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c | 2 +- components/bt/bluedroid/stack/btm/btm_ble_gap.c | 2 +- components/bt/bluedroid/stack/include/btm_ble_api.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/bt/bluedroid/bta/dm/bta_dm_api.c b/components/bt/bluedroid/bta/dm/bta_dm_api.c index 0ae3af50a1..4e3953f233 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_api.c +++ b/components/bt/bluedroid/bta/dm/bta_dm_api.c @@ -2127,7 +2127,7 @@ void BTA_DmCloseACL(BD_ADDR bd_addr, BOOLEAN remove_dev, tBTA_TRANSPORT transpor ** 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_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb) { diff --git a/components/bt/bluedroid/bta/dm/bta_dm_int.h b/components/bt/bluedroid/bta/dm/bta_dm_int.h index adb5fc033d..91a0cb056e 100644 --- a/components/bt/bluedroid/bta/dm/bta_dm_int.h +++ b/components/bt/bluedroid/bta/dm/bta_dm_int.h @@ -478,7 +478,7 @@ typedef struct { typedef struct { BT_HDR hdr; BOOLEAN start; - UINT16 duration; + UINT32 duration; tBTA_DM_SEARCH_CBACK *p_cback; tBTA_START_STOP_SCAN_CMPL_CBACK *p_start_scan_cback; tBTA_START_STOP_SCAN_CMPL_CBACK *p_stop_scan_cback; diff --git a/components/bt/bluedroid/bta/include/bta_api.h b/components/bt/bluedroid/bta/include/bta_api.h index 0c6baa92d5..6d9842d14c 100644 --- a/components/bt/bluedroid/bta/include/bta_api.h +++ b/components/bt/bluedroid/bta/include/bta_api.h @@ -2010,7 +2010,7 @@ extern void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport, ** 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_START_STOP_SCAN_CMPL_CBACK *p_start_stop_scan_cb); diff --git a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c index 027e8d4acd..a55ec4d743 100644 --- a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c +++ b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c @@ -580,7 +580,7 @@ static void btc_set_encryption_callback(BD_ADDR bd_addr, tBTA_TRANSPORT transpor } #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_START_STOP_SCAN_CMPL_CBACK *start_scan_cb) { diff --git a/components/bt/bluedroid/stack/btm/btm_ble_gap.c b/components/bt/bluedroid/stack/btm/btm_ble_gap.c index 9bf52ac221..0c1dc29a93 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_gap.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_gap.c @@ -341,7 +341,7 @@ BOOLEAN btm_ble_send_extended_scan_params(UINT8 scan_type, UINT32 scan_int, ** 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_BLE_INQ_CB *p_inq = &btm_cb.ble_ctr_cb.inq_var; diff --git a/components/bt/bluedroid/stack/include/btm_ble_api.h b/components/bt/bluedroid/stack/include/btm_ble_api.h index 1b78276cb3..f34db43d24 100644 --- a/components/bt/bluedroid/stack/include/btm_ble_api.h +++ b/components/bt/bluedroid/stack/include/btm_ble_api.h @@ -1191,7 +1191,7 @@ tBTM_STATUS BTM_BleWriteScanRspRaw(UINT8 *p_raw_scan_rsp, UINT32 raw_scan_rsp_le ** *******************************************************************************/ //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); -- 2.40.0