From c5927146791cd166edd86d8a4b30c78c14dc215c Mon Sep 17 00:00:00 2001 From: wangmengyang Date: Wed, 11 Jan 2017 13:36:48 +0800 Subject: [PATCH] component/bt: fix typos in "if" condition espressions --- components/bt/bluedroid/api/esp_blufi_api.c | 8 ++--- components/bt/bluedroid/api/esp_bt_device.c | 2 +- components/bt/bluedroid/api/esp_gap_ble_api.c | 30 ++++++++-------- components/bt/bluedroid/api/esp_gattc_api.c | 36 +++++++++---------- components/bt/bluedroid/api/esp_gatts_api.c | 28 +++++++-------- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/components/bt/bluedroid/api/esp_blufi_api.c b/components/bt/bluedroid/api/esp_blufi_api.c index ac84ee3fc2..70f5c9ce8f 100644 --- a/components/bt/bluedroid/api/esp_blufi_api.c +++ b/components/bt/bluedroid/api/esp_blufi_api.c @@ -24,7 +24,7 @@ esp_err_t esp_blufi_register_callbacks(esp_blufi_callbacks_t *callbacks) { - if (ESP_BLUEDROID_STATUS_UNINITIALIZED == esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) { return ESP_ERR_INVALID_STATE; } @@ -41,7 +41,7 @@ esp_err_t esp_blufi_send_wifi_conn_report(wifi_mode_t opmode, esp_blufi_sta_conn btc_msg_t msg; btc_blufi_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -61,7 +61,7 @@ esp_err_t esp_blufi_profile_init(void) { btc_msg_t msg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -76,7 +76,7 @@ esp_err_t esp_blufi_profile_deinit(void) { btc_msg_t msg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } diff --git a/components/bt/bluedroid/api/esp_bt_device.c b/components/bt/bluedroid/api/esp_bt_device.c index 1eb48c98ac..dffcbe80b2 100644 --- a/components/bt/bluedroid/api/esp_bt_device.c +++ b/components/bt/bluedroid/api/esp_bt_device.c @@ -19,7 +19,7 @@ const uint8_t *esp_bt_dev_get_address(void) { - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return NULL; } return controller_get_interface()->get_address()->address; diff --git a/components/bt/bluedroid/api/esp_gap_ble_api.c b/components/bt/bluedroid/api/esp_gap_ble_api.c index 34914f8b4d..f9401d8c42 100644 --- a/components/bt/bluedroid/api/esp_gap_ble_api.c +++ b/components/bt/bluedroid/api/esp_gap_ble_api.c @@ -24,7 +24,7 @@ esp_err_t esp_ble_gap_register_callback(esp_gap_ble_cb_t callback) { - if (ESP_BLUEDROID_STATUS_UNINITIALIZED == esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) { return ESP_ERR_INVALID_STATE; } return (btc_profile_cb_set(BTC_PID_GAP_BLE, callback) == 0 ? ESP_OK : ESP_FAIL); @@ -36,7 +36,7 @@ esp_err_t esp_ble_gap_config_adv_data(esp_ble_adv_data_t *adv_data) btc_msg_t msg; btc_ble_gap_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -63,7 +63,7 @@ esp_err_t esp_ble_gap_set_scan_params(esp_ble_scan_params_t *scan_params) btc_msg_t msg; btc_ble_gap_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -84,7 +84,7 @@ esp_err_t esp_ble_gap_start_scanning(uint32_t duration) btc_msg_t msg; btc_ble_gap_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -100,8 +100,8 @@ esp_err_t esp_ble_gap_start_scanning(uint32_t duration) esp_err_t esp_ble_gap_stop_scanning(void) { btc_msg_t msg; - - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -116,7 +116,7 @@ esp_err_t esp_ble_gap_start_advertising(esp_ble_adv_params_t *adv_params) btc_msg_t msg; btc_ble_gap_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -132,7 +132,7 @@ esp_err_t esp_ble_gap_stop_advertising(void) { btc_msg_t msg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -149,7 +149,7 @@ esp_err_t esp_ble_gap_update_conn_params(esp_ble_conn_update_params_t *params) btc_msg_t msg; btc_ble_gap_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -165,8 +165,8 @@ esp_err_t esp_ble_gap_set_pkt_data_len(esp_bd_addr_t remote_device, uint16_t tx_ { btc_msg_t msg; btc_ble_gap_args_t arg; - - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -184,8 +184,8 @@ esp_err_t esp_ble_gap_set_rand_addr(esp_bd_addr_t rand_addr) { btc_msg_t msg; btc_ble_gap_args_t arg; - - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -203,7 +203,7 @@ esp_err_t esp_ble_gap_config_local_privacy (bool privacy_enable) btc_msg_t msg; btc_ble_gap_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -220,7 +220,7 @@ esp_err_t esp_ble_gap_set_device_name(const char *name) btc_msg_t msg; btc_ble_gap_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } diff --git a/components/bt/bluedroid/api/esp_gattc_api.c b/components/bt/bluedroid/api/esp_gattc_api.c index 4baa0a77fc..8b9cc99e87 100644 --- a/components/bt/bluedroid/api/esp_gattc_api.c +++ b/components/bt/bluedroid/api/esp_gattc_api.c @@ -22,7 +22,7 @@ esp_err_t esp_ble_gattc_register_callback(esp_gattc_cb_t callback) { - if (ESP_BLUEDROID_STATUS_UNINITIALIZED == esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) { return ESP_ERR_INVALID_STATE; } @@ -39,7 +39,7 @@ esp_err_t esp_ble_gattc_app_register(uint16_t app_id) btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -60,7 +60,7 @@ esp_err_t esp_ble_gattc_app_unregister(esp_gatt_if_t gattc_if) btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -77,7 +77,7 @@ esp_err_t esp_ble_gattc_open(esp_gatt_if_t gattc_if, esp_bd_addr_t remote_bda, b btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -96,7 +96,7 @@ esp_err_t esp_ble_gattc_close (esp_gatt_if_t gattc_if, uint16_t conn_id) btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -113,7 +113,7 @@ esp_err_t esp_ble_gattc_config_mtu (esp_gatt_if_t gattc_if, uint16_t conn_id, ui btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -135,7 +135,7 @@ esp_err_t esp_ble_gattc_search_service(esp_gatt_if_t gattc_if, uint16_t conn_id, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -162,7 +162,7 @@ esp_err_t esp_ble_gattc_get_characteristic(esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -191,7 +191,7 @@ esp_err_t esp_ble_gattc_get_descriptor(esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -222,7 +222,7 @@ esp_err_t esp_ble_gattc_get_included_service(esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -252,7 +252,7 @@ esp_err_t esp_ble_gattc_read_char (esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -277,7 +277,7 @@ esp_err_t esp_ble_gattc_read_char_descr (esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -305,7 +305,7 @@ esp_err_t esp_ble_gattc_write_char( esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -336,7 +336,7 @@ esp_err_t esp_ble_gattc_write_char_descr (esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -368,7 +368,7 @@ esp_err_t esp_ble_gattc_prepare_write(esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -391,7 +391,7 @@ esp_err_t esp_ble_gattc_execute_write (esp_gatt_if_t gattc_if, uint16_t conn_id, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -412,7 +412,7 @@ esp_gatt_status_t esp_ble_gattc_register_for_notify (esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -435,7 +435,7 @@ esp_gatt_status_t esp_ble_gattc_unregister_for_notify (esp_gatt_if_t gattc_if, btc_msg_t msg; btc_ble_gattc_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } diff --git a/components/bt/bluedroid/api/esp_gatts_api.c b/components/bt/bluedroid/api/esp_gatts_api.c index 1f0d668e5a..71b5a4338c 100644 --- a/components/bt/bluedroid/api/esp_gatts_api.c +++ b/components/bt/bluedroid/api/esp_gatts_api.c @@ -24,7 +24,7 @@ esp_err_t esp_ble_gatts_register_callback(esp_gatts_cb_t callback) { - if (ESP_BLUEDROID_STATUS_UNINITIALIZED == esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() == ESP_BLUEDROID_STATUS_UNINITIALIZED) { return ESP_ERR_INVALID_STATE; } return (btc_profile_cb_set(BTC_PID_GATTS, callback) == 0 ? ESP_OK : ESP_FAIL); @@ -35,7 +35,7 @@ esp_err_t esp_ble_gatts_app_register(uint16_t app_id) btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -58,7 +58,7 @@ esp_err_t esp_ble_gatts_app_unregister(esp_gatt_if_t gatts_if) btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -76,7 +76,7 @@ esp_err_t esp_ble_gatts_create_service(esp_gatt_if_t gatts_if, btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -96,7 +96,7 @@ esp_err_t esp_ble_gatts_add_included_service(uint16_t service_handle, uint16_t i btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -116,7 +116,7 @@ esp_err_t esp_ble_gatts_add_char(uint16_t service_handle, esp_bt_uuid_t *char_ btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -139,7 +139,7 @@ esp_err_t esp_ble_gatts_add_char_descr (uint16_t service_handle, btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -158,7 +158,7 @@ esp_err_t esp_ble_gatts_delete_service(uint16_t service_handle) btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -175,7 +175,7 @@ esp_err_t esp_ble_gatts_start_service(uint16_t service_handle) btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -192,7 +192,7 @@ esp_err_t esp_ble_gatts_stop_service(uint16_t service_handle) btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -211,7 +211,7 @@ esp_err_t esp_ble_gatts_send_indicate(esp_gatt_if_t gatts_if, uint16_t conn_id, btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -233,7 +233,7 @@ esp_err_t esp_ble_gatts_send_response(esp_gatt_if_t gatts_if, uint16_t conn_id, btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -253,7 +253,7 @@ esp_err_t esp_ble_gatts_open(esp_gatt_if_t gatts_if, esp_bd_addr_t remote_bda, b btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } @@ -272,7 +272,7 @@ esp_err_t esp_ble_gatts_close(esp_gatt_if_t gatts_if, uint16_t conn_id) btc_msg_t msg; btc_ble_gatts_args_t arg; - if (ESP_BLUEDROID_STATUS_ENABLED != esp_bluedroid_get_status()) { + if (esp_bluedroid_get_status() != ESP_BLUEDROID_STATUS_ENABLED) { return ESP_ERR_INVALID_STATE; } -- 2.40.0