alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-27 20:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/twai_caps_naming_and_tidy_up_v4.3' into 'release/v4.3'

Browse Source 
Fix TWAI caps (backport v4.3)

See merge request espressif/esp-idf!13304
This commit is contained in:
Michael (XIAO Xufeng)
2021-04-28 17:47:35 +00:00
parent 64de7ee38c 00801c8044
commit 9da031e0c3
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/hal/esp32/include/hal/twai_ll.h
View File

@@ -395,7 +395,7 @@ static inline uint32_t twai_ll_get_and_clear_intrs(twai_dev_t *hw)
*/
static inline void twai_ll_set_enabled_intrs(twai_dev_t *hw, uint32_t intr_mask)
{
#if TWAI_BRP_DIV_SUPPORTED
#if SOC_TWAI_BRP_DIV_SUPPORTED
//ESP32 Rev 2 or later has brp div field. Need to mask it out
hw->interrupt_enable_reg.val = (hw->interrupt_enable_reg.val & 0x10) | intr_mask;
#else
@@ -421,7 +421,7 @@ static inline void twai_ll_set_enabled_intrs(twai_dev_t *hw, uint32_t intr_mask)
*/
static inline void twai_ll_set_bus_timing(twai_dev_t *hw, uint32_t brp, uint32_t sjw, uint32_t tseg1, uint32_t tseg2, bool triple_sampling)
{
#if TWAI_BRP_DIV_SUPPORTED
#if SOC_TWAI_BRP_DIV_SUPPORTED
if (brp > SOC_TWAI_BRP_DIV_THRESH) {
//Need to set brp_div bit
hw->interrupt_enable_reg.brp_div = 1;