mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-01 19:54:32 +02:00
Merge branch 'bugfix/apply_precommit_fixes' into 'master'
Apply all precommit fixes See merge request espressif/esp-idf!11178
This commit is contained in:
Angus Gratton
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -12,5 +12,3 @@ contact_links:
|
||||
- name: Hardware-related services
|
||||
url: https://www.espressif.com/en/products/hardware-services
|
||||
about: Espressif service providing hardware design and certification support
|
||||
|
||||
|
||||
|
||||
@@ -1,13 +1,29 @@
|
||||
# See https://pre-commit.com for more information
|
||||
# See https://pre-commit.com/hooks.html for more hooks
|
||||
|
||||
whitespace_excludes: &common_whitespace_excludes
|
||||
# note: whitespace exclusions use multiline regex, see https://pre-commit.com/#regular-expressions
|
||||
# items are:
|
||||
# 1 - some file extensions
|
||||
# 2 - any file matching *test*/*expected* (for host tests, if possible use this naming pattern always)
|
||||
# 3 - any directory named 'testdata'
|
||||
# 4 - IDF monitor test data
|
||||
exclude: |
|
||||
(?x)^(
|
||||
.+\.(md|rst|map|bin)|
|
||||
.+test.*\/.*expected.*|
|
||||
.+\/testdata\/.+|
|
||||
.+test_idf_monitor\/tests\/.+
|
||||
)$
|
||||
|
||||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v3.3.0
|
||||
hooks:
|
||||
- id: trailing-whitespace
|
||||
exclude: '.+\.(md|rst)'
|
||||
<<: *common_whitespace_excludes
|
||||
- id: end-of-file-fixer
|
||||
<<: *common_whitespace_excludes
|
||||
- id: check-executables-have-shebangs
|
||||
- id: file-contents-sorter
|
||||
files: 'tools/ci/executable-list.txt'
|
||||
|
||||
@@ -16,5 +16,3 @@ else
|
||||
export PATH="${IDF_ADD_PATHS_EXTRAS}:${PATH}"
|
||||
echo "Added to PATH: ${IDF_ADD_PATHS_EXTRAS}"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@@ -111,4 +111,3 @@ static IRAM_ATTR void record_free(void *p, void **callers)
|
||||
#include "heap_trace.inc"
|
||||
|
||||
#endif /*CONFIG_HEAP_TRACING_TOHOST*/
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
set(asio_sources "asio/asio/src/asio.cpp")
|
||||
|
||||
if (CONFIG_ASIO_SSL_SUPPORT)
|
||||
if(CONFIG_ASIO_SSL_SUPPORT)
|
||||
if(CONFIG_ASIO_USE_ESP_OPENSSL)
|
||||
list(APPEND asio_sources
|
||||
"asio/asio/src/asio_ssl.cpp"
|
||||
@@ -17,7 +17,7 @@ idf_component_register(SRCS ${asio_sources}
|
||||
INCLUDE_DIRS "asio/asio/include" "port/include"
|
||||
REQUIRES lwip)
|
||||
|
||||
if (CONFIG_ASIO_SSL_SUPPORT)
|
||||
if(CONFIG_ASIO_SSL_SUPPORT)
|
||||
if(CONFIG_ASIO_USE_ESP_WOLFSSL)
|
||||
idf_component_get_property(wolflib esp-wolfssl COMPONENT_LIB)
|
||||
idf_component_get_property(wolfdir esp-wolfssl COMPONENT_DIR)
|
||||
|
||||
@@ -13,9 +13,13 @@ if(NOT CONFIG_SECURE_BOOT)
|
||||
endif()
|
||||
|
||||
esptool_py_custom_target(bootloader-flash bootloader "bootloader")
|
||||
esptool_py_flash_target_image(bootloader-flash bootloader ${CONFIG_BOOTLOADER_OFFSET_IN_FLASH} "${BOOTLOADER_BUILD_DIR}/bootloader.bin")
|
||||
esptool_py_flash_target_image(bootloader-flash bootloader
|
||||
${CONFIG_BOOTLOADER_OFFSET_IN_FLASH}
|
||||
"${BOOTLOADER_BUILD_DIR}/bootloader.bin")
|
||||
|
||||
# Also attach an image to the project flash target
|
||||
if(NOT CONFIG_SECURE_BOOT)
|
||||
esptool_py_flash_target_image(flash bootloader ${CONFIG_BOOTLOADER_OFFSET_IN_FLASH} "${BOOTLOADER_BUILD_DIR}/bootloader.bin")
|
||||
esptool_py_flash_target_image(flash bootloader
|
||||
${CONFIG_BOOTLOADER_OFFSET_IN_FLASH}
|
||||
"${BOOTLOADER_BUILD_DIR}/bootloader.bin")
|
||||
endif()
|
||||
@@ -788,4 +788,3 @@ menu "Security features"
|
||||
|
||||
|
||||
endmenu # Security features
|
||||
|
||||
|
||||
@@ -4,4 +4,3 @@
|
||||
#
|
||||
# See Makefile.projbuild for the targets which actually build the bootloader.
|
||||
COMPONENT_CONFIG_ONLY := 1
|
||||
|
||||
|
||||
@@ -15,7 +15,19 @@ if(NOT IDF_TARGET)
|
||||
"in by the parent build process.")
|
||||
endif()
|
||||
|
||||
set(COMPONENTS bootloader esptool_py esp_hw_support hal partition_table soc bootloader_support log spi_flash micro-ecc main efuse)
|
||||
set(COMPONENTS
|
||||
bootloader
|
||||
esptool_py
|
||||
esp_hw_support
|
||||
hal
|
||||
partition_table
|
||||
soc
|
||||
bootloader_support
|
||||
log
|
||||
spi_flash
|
||||
micro-ecc
|
||||
main
|
||||
efuse)
|
||||
set(BOOTLOADER_BUILD 1)
|
||||
include("${IDF_PATH}/tools/cmake/project.cmake")
|
||||
set(common_req log esp_rom esp_common esp_hw_support hal xtensa)
|
||||
@@ -87,7 +99,7 @@ if(CONFIG_SECURE_BOOTLOADER_REFLASHABLE)
|
||||
DEPENDS gen_secure_bootloader_key gen_project_binary
|
||||
VERBATIM)
|
||||
|
||||
add_custom_target (gen_bootloader_digest_bin ALL DEPENDS "${bootloader_digest_bin}")
|
||||
add_custom_target(gen_bootloader_digest_bin ALL DEPENDS "${bootloader_digest_bin}")
|
||||
endif()
|
||||
|
||||
if(CONFIG_SECURE_BOOT_V2_ENABLED)
|
||||
@@ -105,12 +117,14 @@ if(CONFIG_SECURE_BOOT_V2_ENABLED)
|
||||
|
||||
set(bootloader_unsigned_bin "bootloader-unsigned.bin")
|
||||
add_custom_command(OUTPUT ".signed_bin_timestamp"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/${PROJECT_BIN}" "${CMAKE_BINARY_DIR}/${bootloader_unsigned_bin}"
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/${PROJECT_BIN}"
|
||||
"${CMAKE_BINARY_DIR}/${bootloader_unsigned_bin}"
|
||||
COMMAND ${ESPSECUREPY} sign_data --version 2 --keyfile "${secure_boot_signing_key}"
|
||||
-o "${CMAKE_BINARY_DIR}/${PROJECT_BIN}" "${CMAKE_BINARY_DIR}/${bootloader_unsigned_bin}"
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "Generated signed binary image ${build_dir}/${PROJECT_BIN}"
|
||||
"from ${CMAKE_BINARY_DIR}/${bootloader_unsigned_bin}"
|
||||
COMMAND ${CMAKE_COMMAND} -E md5sum "${CMAKE_BINARY_DIR}/${PROJECT_BIN}" > "${CMAKE_BINARY_DIR}/.signed_bin_timestamp"
|
||||
COMMAND ${CMAKE_COMMAND} -E md5sum "${CMAKE_BINARY_DIR}/${PROJECT_BIN}"
|
||||
> "${CMAKE_BINARY_DIR}/.signed_bin_timestamp"
|
||||
DEPENDS "${build_dir}/.bin_timestamp"
|
||||
VERBATIM
|
||||
COMMENT "Generated the signed Bootloader")
|
||||
@@ -120,7 +134,7 @@ if(CONFIG_SECURE_BOOT_V2_ENABLED)
|
||||
COMMENT "Bootloader generated but not signed")
|
||||
endif()
|
||||
|
||||
add_custom_target (gen_signed_bootloader ALL DEPENDS "${build_dir}/.signed_bin_timestamp")
|
||||
add_custom_target(gen_signed_bootloader ALL DEPENDS "${build_dir}/.signed_bin_timestamp")
|
||||
endif()
|
||||
|
||||
if(CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH)
|
||||
@@ -175,7 +189,8 @@ elseif(CONFIG_SECURE_BOOT_V2_ENABLED AND CONFIG_IDF_TARGET_ESP32S2)
|
||||
COMMAND ${CMAKE_COMMAND} -E echo
|
||||
"To sign the bootloader with additional private keys."
|
||||
COMMAND ${CMAKE_COMMAND} -E echo
|
||||
"\t${espsecurepy} sign_data -k secure_boot_signing_key2.pem -v 2 --append_signatures -o signed_bootloader.bin build/bootloader/bootloader.bin"
|
||||
"\t${espsecurepy} sign_data -k secure_boot_signing_key2.pem -v 2 \
|
||||
--append_signatures -o signed_bootloader.bin build/bootloader/bootloader.bin"
|
||||
COMMAND ${CMAKE_COMMAND} -E echo
|
||||
"Secure boot enabled, so bootloader not flashed automatically."
|
||||
COMMAND ${CMAKE_COMMAND} -E echo
|
||||
|
||||
@@ -6,4 +6,3 @@ set(scripts "ld/${target}/bootloader.ld"
|
||||
"ld/${target}/bootloader.rom.ld")
|
||||
|
||||
target_linker_script(${COMPONENT_LIB} INTERFACE "${scripts}")
|
||||
|
||||
|
||||
@@ -31,4 +31,3 @@ int bootloader_clock_get_rated_freq_mhz(void);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -27,4 +27,3 @@
|
||||
*/
|
||||
esp_err_t bootloader_flash_wrap_set(spi_flash_wrap_mode_t mode);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -78,5 +78,3 @@ __attribute__((weak)) void bootloader_clock_configure(void)
|
||||
}
|
||||
#endif // CONFIG_ESP_SYSTEM_RTC_EXT_XTAL
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -82,4 +82,3 @@ esp_err_t esp_partition_table_verify(const esp_partition_info_t *partition_table
|
||||
}
|
||||
return ESP_ERR_INVALID_STATE;
|
||||
}
|
||||
|
||||
|
||||
@@ -522,7 +522,7 @@ if(CONFIG_BT_ENABLED)
|
||||
"host/nimble/esp-hci/src/esp_nimble_hci.c"
|
||||
"host/nimble/port/src/esp_nimble_mem.c")
|
||||
|
||||
if (CONFIG_BLE_MESH)
|
||||
if(CONFIG_BLE_MESH)
|
||||
list(APPEND srcs "esp_ble_mesh/mesh_core/nimble_host/mesh_bearer_adapt.c")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -50,5 +50,3 @@ void *btc_profile_cb_get(btc_pid_t profile_id)
|
||||
|
||||
return btc_profile_cb_tab[profile_id];
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -441,4 +441,3 @@ int get_btc_work_queue_size(void)
|
||||
{
|
||||
return osi_thread_queue_wait_size(btc_thread, 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -254,4 +254,3 @@ void fixed_queue_process(fixed_queue_t *queue)
|
||||
queue->dequeue_ready(queue);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -61,4 +61,3 @@ void hash_function_blob(const unsigned char *s, unsigned int len, hash_key_t h)
|
||||
h[0] = (h[0] << 7) + h[0] + *s++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -50,4 +50,3 @@ void osi_mutex_global_lock(void);
|
||||
void osi_mutex_global_unlock(void);
|
||||
|
||||
#endif /* __MUTEX_H__ */
|
||||
|
||||
|
||||
@@ -1123,4 +1123,3 @@ if BLE_MESH
|
||||
endmenu
|
||||
|
||||
endif # BLE_MESH
|
||||
|
||||
|
||||
@@ -536,4 +536,3 @@ const uint8_t *esp_ble_mesh_get_fast_prov_app_key(uint16_t net_idx, uint16_t app
|
||||
return bt_mesh_get_fast_prov_app_key(net_idx, app_idx);
|
||||
}
|
||||
#endif /* CONFIG_BLE_MESH_FAST_PROV */
|
||||
|
||||
|
||||
@@ -530,4 +530,3 @@ esp_err_t esp_ble_mesh_set_fast_prov_action(esp_ble_mesh_fast_prov_action_t acti
|
||||
}
|
||||
|
||||
#endif /* CONFIG_BLE_MESH_FAST_PROV */
|
||||
|
||||
|
||||
@@ -124,4 +124,3 @@ esp_err_t esp_ble_mesh_proxy_client_remove_filter_addr(uint8_t conn_handle, uint
|
||||
#endif
|
||||
|
||||
#endif /* _ESP_BLE_MESH_PROXY_API_H_ */
|
||||
|
||||
|
||||
@@ -823,4 +823,3 @@ esp_err_t esp_ble_mesh_config_client_set_state(esp_ble_mesh_client_common_param_
|
||||
#endif
|
||||
|
||||
#endif /* _ESP_BLE_MESH_CONFIG_MODEL_API_H_ */
|
||||
|
||||
|
||||
@@ -1302,4 +1302,3 @@ esp_err_t esp_ble_mesh_register_generic_server_callback(esp_ble_mesh_generic_ser
|
||||
#endif
|
||||
|
||||
#endif /* _ESP_BLE_MESH_GENERIC_MODEL_API_H_ */
|
||||
|
||||
|
||||
@@ -1680,4 +1680,3 @@ esp_err_t esp_ble_mesh_register_lighting_server_callback(esp_ble_mesh_lighting_s
|
||||
#endif
|
||||
|
||||
#endif /* _ESP_BLE_MESH_LIGHTING_MODEL_API_H_ */
|
||||
|
||||
|
||||
@@ -715,5 +715,3 @@ esp_err_t esp_ble_mesh_register_sensor_server_callback(esp_ble_mesh_sensor_serve
|
||||
#endif
|
||||
|
||||
#endif /* _ESP_BLE_MESH_SENSOR_MODEL_API_H_ */
|
||||
|
||||
|
||||
|
||||
@@ -917,4 +917,3 @@ esp_err_t esp_ble_mesh_register_time_scene_server_callback(esp_ble_mesh_time_sce
|
||||
#endif
|
||||
|
||||
#endif /* _ESP_BLE_MESH_TIME_SCENE_MODEL_API_H_ */
|
||||
|
||||
|
||||
@@ -81,4 +81,3 @@ void btc_ble_mesh_lighting_server_cb_handler(btc_msg_t *msg);
|
||||
#endif
|
||||
|
||||
#endif /* _BTC_BLE_MESH_LIGHTING_MODEL_H_ */
|
||||
|
||||
|
||||
@@ -80,4 +80,3 @@ void btc_ble_mesh_sensor_server_cb_handler(btc_msg_t *msg);
|
||||
#endif
|
||||
|
||||
#endif /* _BTC_BLE_MESH_SENSOR_MODEL_H_ */
|
||||
|
||||
|
||||
@@ -81,4 +81,3 @@ void btc_ble_mesh_time_scene_server_cb_handler(btc_msg_t *msg);
|
||||
#endif
|
||||
|
||||
#endif /* _BTC_BLE_MESH_TIME_SCENE_MODEL_H_ */
|
||||
|
||||
|
||||
@@ -1755,4 +1755,3 @@ static inline size_t net_buf_frags_len(struct net_buf *buf)
|
||||
#endif
|
||||
|
||||
#endif /* _BLE_MESH_BUF_H_ */
|
||||
|
||||
|
||||
@@ -57,4 +57,3 @@ void k_sleep(s32_t duration);
|
||||
#endif
|
||||
|
||||
#endif /* _BLE_MESH_KERNEL_H_ */
|
||||
|
||||
|
||||
@@ -55,4 +55,3 @@ void bt_mesh_mutex_deinit(void);
|
||||
#endif
|
||||
|
||||
#endif /* _BLE_MESH_MUTEX_H_ */
|
||||
|
||||
|
||||
@@ -465,4 +465,3 @@ static inline bool sys_slist_find_and_remove(sys_slist_t *list,
|
||||
#endif
|
||||
|
||||
#endif /* _BLE_MESH_SLIST_H_ */
|
||||
|
||||
|
||||
@@ -264,4 +264,3 @@ void bt_mesh_timer_deinit(void);
|
||||
#endif
|
||||
|
||||
#endif /* _BLE_MESH_TIMER_H_ */
|
||||
|
||||
|
||||
@@ -813,4 +813,3 @@ int bt_mesh_update_exceptional_list(u8_t sub_code, u8_t type, void *info);
|
||||
#endif
|
||||
|
||||
#endif /* _BLE_MESH_BEARER_ADAPT_H_ */
|
||||
|
||||
|
||||
@@ -128,4 +128,3 @@ int bt_mesh_set_client_model_role(struct bt_mesh_model *model, u8_t role);
|
||||
#endif
|
||||
|
||||
#endif /* _CLIENT_COMMON_H_ */
|
||||
|
||||
|
||||
@@ -211,4 +211,3 @@ esp_err_t esp_bluedroid_deinit(void)
|
||||
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -643,4 +643,3 @@ esp_err_t esp_ble_gattc_cache_get_addr_list(esp_gatt_if_t gattc_if)
|
||||
}
|
||||
|
||||
#endif ///GATTC_INCLUDED == TRUE
|
||||
|
||||
|
||||
@@ -691,4 +691,3 @@ extern void bta_av_reg_vdp (tAVDT_CS *p_cs, char *p_service_name, void *p_data);
|
||||
#endif ///BTA_AV_INCLUDED == TRUE
|
||||
|
||||
#endif /* BTA_AV_INT_H */
|
||||
|
||||
|
||||
@@ -465,4 +465,3 @@ void bta_dm_co_ble_oob_support(UINT8 enable)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -486,4 +486,3 @@ BOOLEAN bta_dm_search_sm_execute(BT_HDR *p_msg)
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
@@ -1170,4 +1170,3 @@ tBTA_DM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -33,4 +33,3 @@ uint16_t BTA_GATT_GetLocalMTU(void)
|
||||
{
|
||||
return gatt_get_local_mtu();
|
||||
}
|
||||
|
||||
|
||||
@@ -1070,4 +1070,3 @@ void BTA_GATTC_Broadcast(tBTA_GATTC_IF client_if, BOOLEAN start)
|
||||
}
|
||||
|
||||
#endif /* defined(GATTC_INCLUDED) && (GATTC_INCLUDED == TRUE) */
|
||||
|
||||
|
||||
@@ -2194,4 +2194,3 @@ void bta_gattc_cache_reset(BD_ADDR server_bda)
|
||||
|
||||
//#endif /* GATTC_CACHE_NVS */
|
||||
#endif /* BTA_GATT_INCLUDED */
|
||||
|
||||
|
||||
@@ -664,4 +664,3 @@ BOOLEAN bta_gattc_co_cache_clear_assoc_addr(BD_ADDR src_addr)
|
||||
// #endif /* #if( defined GATTC_CACHE_NVS ) && (GATTC_CACHE_NVS == TRUE) */
|
||||
#endif /* #if( defined BLE_INCLUDED ) && (BLE_INCLUDED == TRUE) */
|
||||
#endif /* #if( defined BTA_GATT_INCLUDED ) && (BTA_GATT_INCLUDED == TRUE) */
|
||||
|
||||
|
||||
@@ -261,4 +261,3 @@ extern tBTA_GATTS_SRVC_CB *bta_gatts_find_srvc_cb_by_attr_id(tBTA_GATTS_CB *p_cb
|
||||
extern void bta_gatts_deinit(void);
|
||||
|
||||
#endif /* BTA_GATTS_INT_H */
|
||||
|
||||
|
||||
@@ -1253,4 +1253,3 @@ static char *bta_hh_hid_event_name(UINT16 event)
|
||||
}
|
||||
#endif
|
||||
#endif /* BTA_HH_INCLUDED */
|
||||
|
||||
|
||||
@@ -3019,7 +3019,3 @@ static void bta_hh_process_cache_rpt (tBTA_HH_DEV_CB *p_cb,
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -398,4 +398,3 @@ extern void bta_hh_trace_dev_db(void);
|
||||
|
||||
#endif ///defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE)
|
||||
#endif
|
||||
|
||||
|
||||
@@ -220,4 +220,3 @@ extern void bta_av_sbc_bld_hdr(BT_HDR *p_buf, UINT16 fr_per_pkt);
|
||||
#endif ///BTA_AV_INCLUDED == TRUE
|
||||
|
||||
#endif /* BTA_AV_SBC_H */
|
||||
|
||||
|
||||
@@ -109,4 +109,3 @@ extern void bta_sdp_remove_record(tBTA_SDP_MSG *p_data);
|
||||
#endif ///SDP_INCLUDED == TRUE
|
||||
|
||||
#endif /* BTA_SDP_INT_H */
|
||||
|
||||
|
||||
@@ -567,4 +567,3 @@ BOOLEAN bta_sys_vs_hdl(UINT16 evt, void *p)
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -317,5 +317,3 @@ BOOLEAN utl_isdialstr(const char *p_s)
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -932,4 +932,3 @@ int btc_storage_get_num_ble_bond_devices(void)
|
||||
}
|
||||
#endif ///BLE_INCLUDED == TRUE
|
||||
#endif ///SMP_INCLUDED == TRUE
|
||||
|
||||
|
||||
@@ -127,4 +127,3 @@ void btc_main_call_handler(btc_msg_t *msg)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -35,4 +35,3 @@ typedef union {
|
||||
void btc_dev_call_handler(btc_msg_t *msg);
|
||||
|
||||
#endif /* __BTC_DEV_H__ */
|
||||
|
||||
|
||||
@@ -289,5 +289,3 @@ tDIS_STATUS DIS_SrUpdate(tDIS_ATTR_BIT dis_attr_bit, tDIS_ATTR *p_info)
|
||||
return st;
|
||||
}
|
||||
#endif /* BLE_INCLUDED */
|
||||
|
||||
|
||||
|
||||
@@ -44,4 +44,3 @@ void btc_gatt_com_call_handler(btc_msg_t *msg)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -258,4 +258,3 @@ bt_status_t btc_hf_ci_sco_data(void);
|
||||
#endif // BTC_HF_INCLUDED == TRUE
|
||||
|
||||
#endif /* __BTC_HF_AG_H__ */
|
||||
|
||||
|
||||
@@ -99,8 +99,3 @@ void app_ble_security_start(void)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -359,4 +359,3 @@ typedef struct {
|
||||
//extern const bt_vendor_interface_t BLUETOOTH_VENDOR_LIB_INTERFACE;
|
||||
|
||||
#endif /* BT_VENDOR_LIB_H */
|
||||
|
||||
|
||||
@@ -560,4 +560,3 @@ const controller_t *controller_get_interface(void)
|
||||
|
||||
return &interface;
|
||||
}
|
||||
|
||||
|
||||
@@ -83,4 +83,3 @@ void OI_AssertFail(char *file, int line, char *reason);
|
||||
/**@}*/
|
||||
|
||||
#endif /* _OI_ASSERT_H */
|
||||
|
||||
|
||||
@@ -486,5 +486,3 @@ void OI_CODEC_SBC_DumpConfig(OI_CODEC_SBC_FRAME_INFO *frameInfo);
|
||||
|
||||
|
||||
#endif /* _OI_CODEC_SBC_CORE_H */
|
||||
|
||||
|
||||
|
||||
@@ -227,4 +227,3 @@ PRIVATE OI_STATUS OI_CODEC_SBC_Alloc(OI_CODEC_SBC_COMMON_CONTEXT *common,
|
||||
*/
|
||||
|
||||
#endif /* _OI_CODEC_SBC_PRIVATE_H */
|
||||
|
||||
|
||||
@@ -168,4 +168,3 @@ typedef enum {
|
||||
/**@}*/
|
||||
|
||||
#endif /* _OI_MODULES_H */
|
||||
|
||||
|
||||
@@ -194,4 +194,3 @@ void OI_APP_Free(void *ptr);
|
||||
/**@}*/
|
||||
|
||||
#endif /* _OI_OSINTERFACE_H */
|
||||
|
||||
|
||||
@@ -576,4 +576,3 @@ typedef enum {
|
||||
/**@}*/
|
||||
|
||||
#endif /* _OI_STATUS_H */
|
||||
|
||||
|
||||
@@ -205,4 +205,3 @@ OI_INT OI_StrncmpInsensitive(OI_CHAR const *s1,
|
||||
|
||||
/*****************************************************************************/
|
||||
#endif /* OI_STRING_H */
|
||||
|
||||
|
||||
@@ -197,4 +197,3 @@ OI_BOOL OI_Time_NowReachedTime(OI_TIME *pTargetTime);
|
||||
|
||||
/*****************************************************************************/
|
||||
#endif /* _OI_TIME_H */
|
||||
|
||||
|
||||
@@ -374,4 +374,3 @@ const OI_CHAR *OI_ScanBdAddr(const OI_CHAR *str,
|
||||
/**@}*/
|
||||
|
||||
#endif /* _OI_UTILS_H */
|
||||
|
||||
|
||||
@@ -54,4 +54,3 @@ extern void EncQuantizer(SBC_ENC_PARAMS *);
|
||||
SINT32 SBC_Multiply_32_16_Simplified(SINT32 s32In2Temp, SINT32 s32In1Temp);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -371,4 +371,3 @@ const hci_hal_t *hci_hal_h4_get_interface(void)
|
||||
{
|
||||
return &interface;
|
||||
}
|
||||
|
||||
|
||||
@@ -563,4 +563,3 @@ const hci_t *hci_layer_get_interface(void)
|
||||
init_layer_interface();
|
||||
return &interface;
|
||||
}
|
||||
|
||||
|
||||
@@ -254,4 +254,3 @@ const hci_packet_parser_t *hci_packet_parser_get_interface(void)
|
||||
{
|
||||
return &interface;
|
||||
}
|
||||
|
||||
|
||||
@@ -359,4 +359,3 @@ typedef struct {
|
||||
//extern const bt_vendor_interface_t BLUETOOTH_VENDOR_LIB_INTERFACE;
|
||||
|
||||
#endif /* BT_VENDOR_LIB_H */
|
||||
|
||||
|
||||
@@ -236,4 +236,3 @@ const packet_fragmenter_t *packet_fragmenter_get_interface(void)
|
||||
controller = controller_get_interface();
|
||||
return &interface;
|
||||
}
|
||||
|
||||
|
||||
@@ -205,4 +205,3 @@
|
||||
#endif ///AVRC_INCLUDED == TRUE
|
||||
|
||||
#endif /* AVDT_DEFS_H */
|
||||
|
||||
|
||||
@@ -621,5 +621,3 @@ void btm_ble_refresh_local_resolvable_private_addr(BD_ADDR pseudo_addr,
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -814,5 +814,3 @@ BOOLEAN btm_send_pending_direct_conn(void)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -106,4 +106,3 @@ tBTM_STATUS BTM_BleGetEnergyInfo(tBTM_BLE_ENERGY_INFO_CBACK *p_ener_cback)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -872,4 +872,3 @@ void *btm_ble_multi_adv_get_ref(UINT8 inst_id)
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1924,4 +1924,3 @@ static void btu_ble_rc_param_req_evt(UINT8 *p)
|
||||
#endif /* BLE_LLT_INCLUDED */
|
||||
|
||||
#endif /* BLE_INCLUDED */
|
||||
|
||||
|
||||
@@ -790,8 +790,3 @@ BOOLEAN GAP_BleCancelReadPeerDevName (BD_ADDR peer_bda)
|
||||
}
|
||||
|
||||
#endif /* BLE_INCLUDED == TRUE && GATTS_INCLUDED == TRUE*/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1636,4 +1636,3 @@ BOOLEAN GATT_Listen (tGATT_IF gatt_if, BOOLEAN start, BD_ADDR_PTR bd_addr)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -2890,5 +2890,3 @@ BOOLEAN gatt_update_listen_mode(void)
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -1047,4 +1047,3 @@ BOOLEAN btsnd_hcic_ble_set_channels (BLE_CHANNELS channels)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -2655,4 +2655,3 @@ typedef struct {
|
||||
#define HCI_LE_RC_CONN_PARAM_UPD_NEG_RPY_SUPPORTED(x) ((x)[HCI_SUPP_COMMANDS_LE_RC_CONN_PARAM_UPD_NEG_RPY_OFF] & HCI_SUPP_COMMANDS_RLE_RC_CONN_PARAM_UPD_NEG_RPY_MASK)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -160,4 +160,3 @@ typedef struct sdp_info {
|
||||
|
||||
#endif ///HID_HOST_INCLUDED == TRUE
|
||||
#endif
|
||||
|
||||
|
||||
@@ -67,4 +67,3 @@ typedef struct {
|
||||
} tBT_SECURITY;
|
||||
|
||||
#endif /* PROFILES_API_H */
|
||||
|
||||
|
||||
@@ -323,5 +323,3 @@
|
||||
#define ATTR_ID_NETADDRESS_OR_DEVLOCATION 0x0306
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -1261,5 +1261,3 @@ void l2c_enqueue_peer_data (tL2C_CCB *p_ccb, BT_HDR *p_buf)
|
||||
l2cb.check_round_robin = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1008,5 +1008,3 @@ UINT8 l2c_data_write (UINT16 cid, BT_HDR *p_data, UINT16 flags)
|
||||
return (L2CAP_DW_SUCCESS);
|
||||
}
|
||||
#endif ///CLASSIC_BT_INCLUDED == TRUE
|
||||
|
||||
|
||||
|
||||
@@ -3670,4 +3670,3 @@ void l2cu_check_channel_congestion (tL2C_CCB *p_ccb)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -706,6 +706,3 @@ void sdp_conn_timeout (tCONN_CB *p_ccb)
|
||||
}
|
||||
|
||||
#endif ///SDP_INCLUDED == TRUE
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -72,5 +72,3 @@ bool ECC_CheckPointIsInElliCur_P256(Point *p);
|
||||
#define ECC_PointMult(q, p, n, keyLength) ECC_PointMult_Bin_NAF(q, p, n, keyLength)
|
||||
|
||||
void p_256_init_curve(UINT32 keyLength);
|
||||
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user