espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
spi_master: correctly set cs polarity (4.2)

See merge request espressif/esp-idf!10391
This commit is contained in:
Michael (XIAO Xufeng)
2020-10-17 09:27:24 +08:00
parent ae0bec8de0 3dd5b574ee
commit 33443d80af
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
components/soc/src/esp32s2/include/hal/spi_ll.h
View File

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