Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-03 03:31:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(i2c_test_apps): Fix the conflict when including spimem_flash_ll

Browse Source 
Update to avoid the conflict that C++ compiler complains about low level C
code
This commit is contained in:
Chen Chen
2025-08-18 11:20:16 +08:00
committed by BOT
parent 34d2abf533
commit 8361d150de
13 changed files with 71 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/hal/esp32s2/include/hal/spimem_flash_ll.h
+6 -7
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -354,12 +354,11 @@ static inline bool spimem_flash_ll_host_idle(const spi_mem_dev_t *dev)
*/
static inline void spimem_flash_ll_read_phase(spi_mem_dev_t *dev)
{
typeof(dev->user) user = {
.usr_mosi = 0,
.usr_miso = 1,
.usr_addr = 1,
.usr_command = 1,
};
typeof(dev->user) user = {};
user.usr_mosi = 0;
user.usr_miso = 1;
user.usr_addr = 1;
user.usr_command = 1;
dev->user.val = user.val;
}
/*------------------------------------------------------------------------------