alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

component/bt : cleanup a macro

Browse Source
This commit is contained in:
Tian Hao 2016-11-29 14:38:58 +08:00
parent f6de7ea764
commit 06e2a1d4e1
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/bluedroid/api/esp_gattc_api.c
View File

@ -57,6 +57,10 @@ esp_err_t esp_ble_gattc_app_register(uint16_t app_id)
btc_msg_t msg; btc_msg_t msg;
btc_ble_gattc_args_t arg; btc_ble_gattc_args_t arg;
if (app_id < ESP_APP_ID_MIN || app_id > ESP_APP_ID_MAX) {
return ESP_ERR_INVALID_ARG;
}
msg.sig = BTC_SIG_API_CALL; msg.sig = BTC_SIG_API_CALL;
msg.pid = BTC_PID_GATTC; msg.pid = BTC_PID_GATTC;
msg.act = BTC_GATTC_ACT_APP_REGISTER; msg.act = BTC_GATTC_ACT_APP_REGISTER;

2
components/bt/bluedroid/api/esp_gatts_api.c
View File

@ -30,7 +30,7 @@ esp_err_t esp_ble_gatts_app_register(uint16_t app_id)
btc_msg_t msg; btc_msg_t msg;
btc_ble_gatts_args_t arg; btc_ble_gatts_args_t arg;
if (app_id < APP_ID_MIN || app_id > APP_ID_MAX) { if (app_id < ESP_APP_ID_MIN || app_id > ESP_APP_ID_MAX) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }

6
components/bt/bluedroid/api/include/esp_bt_defs.h
View File

@ -78,11 +78,9 @@ typedef enum {
BLE_ADDR_TYPE_RPA_RANDOM = 0x03, BLE_ADDR_TYPE_RPA_RANDOM = 0x03,
} esp_ble_addr_type_t; } esp_ble_addr_type_t;
#define APP_ID_MIN 0x0000 #define ESP_APP_ID_MIN 0x0000
#define APP_ID_MAX 0x7fff #define ESP_APP_ID_MAX 0x7fff
typedef void (* esp_profile_cb_t)(uint32_t event, void *param); typedef void (* esp_profile_cb_t)(uint32_t event, void *param);
#define API_BLE_ISVALID_PARAM(x, min, max) (((x) >= (min) && (x) <= (max)) || ((x) == ESP_BLE_CONN_PARAM_UNDEF))
#endif ///__ESP_BT_DEFS_H__ #endif ///__ESP_BT_DEFS_H__

8
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
View File

@ -367,8 +367,8 @@ void btc_ble_start_advertising (esp_ble_adv_params_t *ble_adv_params)
disc_mode = BTA_DM_BLE_NON_DISCOVERABLE; disc_mode = BTA_DM_BLE_NON_DISCOVERABLE;
} }
if (!API_BLE_ISVALID_PARAM(ble_adv_params->adv_int_min, BTM_BLE_ADV_INT_MIN, BTM_BLE_ADV_INT_MAX) || if (!BLE_ISVALID_PARAM(ble_adv_params->adv_int_min, BTM_BLE_ADV_INT_MIN, BTM_BLE_ADV_INT_MAX) ||
!API_BLE_ISVALID_PARAM(ble_adv_params->adv_int_max, BTM_BLE_ADV_INT_MIN, BTM_BLE_ADV_INT_MAX)) { !BLE_ISVALID_PARAM(ble_adv_params->adv_int_max, BTM_BLE_ADV_INT_MIN, BTM_BLE_ADV_INT_MAX)) {
LOG_ERROR("Invalid advertisting interval parameters.\n"); LOG_ERROR("Invalid advertisting interval parameters.\n");
return ; return ;
} }
@ -424,8 +424,8 @@ static void btc_scan_params_callback(tGATT_IF gatt_if, tBTM_STATUS status)
static void btc_ble_set_scan_params(esp_ble_scan_params_t *scan_params, static void btc_ble_set_scan_params(esp_ble_scan_params_t *scan_params,
tBLE_SCAN_PARAM_SETUP_CBACK scan_param_setup_cback) tBLE_SCAN_PARAM_SETUP_CBACK scan_param_setup_cback)
{ {
if (API_BLE_ISVALID_PARAM(scan_params->scan_interval, BTM_BLE_SCAN_INT_MIN, BTM_BLE_SCAN_INT_MAX) && if (BLE_ISVALID_PARAM(scan_params->scan_interval, BTM_BLE_SCAN_INT_MIN, BTM_BLE_SCAN_INT_MAX) &&
API_BLE_ISVALID_PARAM(scan_params->scan_window, BTM_BLE_SCAN_WIN_MIN, BTM_BLE_SCAN_WIN_MAX) && BLE_ISVALID_PARAM(scan_params->scan_window, BTM_BLE_SCAN_WIN_MIN, BTM_BLE_SCAN_WIN_MAX) &&
(scan_params->scan_type == BTM_BLE_SCAN_MODE_ACTI || scan_params->scan_type == BTM_BLE_SCAN_MODE_PASS)) { (scan_params->scan_type == BTM_BLE_SCAN_MODE_ACTI || scan_params->scan_type == BTM_BLE_SCAN_MODE_PASS)) {
BTA_DmSetBleScanFilterParams(0 /*client_if*/, BTA_DmSetBleScanFilterParams(0 /*client_if*/,
scan_params->scan_interval, scan_params->scan_interval,

2
components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h
View File

@ -18,6 +18,8 @@
#include "esp_bt_defs.h" #include "esp_bt_defs.h"
#include "esp_gap_ble_api.h" #include "esp_gap_ble_api.h"
#define BLE_ISVALID_PARAM(x, min, max) (((x) >= (min) && (x) <= (max)) || ((x) == ESP_BLE_CONN_PARAM_UNDEF))
typedef enum { typedef enum {
BTC_GAP_BLE_ACT_CFG_ADV_DATA = 0, BTC_GAP_BLE_ACT_CFG_ADV_DATA = 0,
BTC_GAP_BLE_ACT_SET_SCAN_PARAM, BTC_GAP_BLE_ACT_SET_SCAN_PARAM,