espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/spi_master_multiple_dev_with_diff_cs_lvl_4.1' into 'release/v4.1'

Browse Source 
spi_master: correctly set cs polarity (4.1)

See merge request espressif/esp-idf!10392
This commit is contained in:
Michael (XIAO Xufeng)
2020-09-21 10:19:33 +08:00
parent 1e526a5d7d 67d7fad764
commit 214cc69fc1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/soc/esp32/include/hal/spi_ll.h
View File

@@ -287,7 +287,7 @@ static inline void spi_ll_master_set_pos_cs(spi_dev_t *hw, int cs, uint32_t pos_
if (pos_cs) { if (pos_cs) {
hw->pin.master_cs_pol |= (1 << cs); hw->pin.master_cs_pol |= (1 << cs);
} else { } else {
hw->pin.master_cs_pol &= (1 << cs); hw->pin.master_cs_pol &= ~(1 << cs);
} }
} }
@@ -611,7 +611,7 @@ static inline void spi_ll_master_set_cksel(spi_dev_t *hw, int cs, uint32_t cksel
if (cksel) { if (cksel) {
hw->pin.master_ck_sel |= (1 << cs); hw->pin.master_ck_sel |= (1 << cs);
} else { } else {
hw->pin.master_ck_sel &= (1 << cs); hw->pin.master_ck_sel &= ~(1 << cs);
} }
} }

2
components/soc/esp32s2beta/include/hal/spi_ll.h
View File

@@ -322,7 +322,7 @@ static inline void spi_ll_master_set_pos_cs(spi_dev_t *hw, int cs, uint32_t pos_
if (pos_cs) { if (pos_cs) {
hw->misc.master_cs_pol |= (1 << cs); hw->misc.master_cs_pol |= (1 << cs);
} else { } else {
hw->misc.master_cs_pol &= (1 << cs); hw->misc.master_cs_pol &= ~(1 << cs);
} }
} }