Skip to content

Commit ea05ae7

Browse files
committed
Merge branch 'bugfix/huk_ll_enable_interrupt_v5.3' into 'release/v5.3'
fix(huk): switch case fall through unexpected (v5.3) See merge request espressif/esp-idf!31721
2 parents 8f0584c + d054c4b commit ea05ae7

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

components/hal/esp32p4/include/hal/huk_ll.h

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,30 +58,36 @@ static inline void huk_ll_continue(void)
5858
/* @bried Enable or Disable the HUK interrupts */
5959
static inline void huk_ll_configure_interrupt(const esp_huk_interrupt_type_t intr, const bool en)
6060
{
61-
switch(intr) {
62-
case ESP_HUK_INT_PREP_DONE:
63-
REG_SET_FIELD(HUK_INT_ENA_REG, HUK_PREP_DONE_INT_ENA, en);
64-
case ESP_HUK_INT_PROC_DONE:
65-
REG_SET_FIELD(HUK_INT_ENA_REG, HUK_PROC_DONE_INT_ENA, en);
66-
case ESP_HUK_INT_POST_DONE:
67-
REG_SET_FIELD(HUK_INT_ENA_REG, HUK_POST_DONE_INT_ENA, en);
68-
default:
69-
return;
61+
switch (intr) {
62+
case ESP_HUK_INT_PREP_DONE:
63+
REG_SET_FIELD(HUK_INT_ENA_REG, HUK_PREP_DONE_INT_ENA, en);
64+
break;
65+
case ESP_HUK_INT_PROC_DONE:
66+
REG_SET_FIELD(HUK_INT_ENA_REG, HUK_PROC_DONE_INT_ENA, en);
67+
break;
68+
case ESP_HUK_INT_POST_DONE:
69+
REG_SET_FIELD(HUK_INT_ENA_REG, HUK_POST_DONE_INT_ENA, en);
70+
break;
71+
default:
72+
return;
7073
}
7174
}
7275

7376
/* @bried Clear the HUK interrupts */
7477
static inline void huk_ll_clear_int(const esp_huk_interrupt_type_t intr)
7578
{
76-
switch(intr) {
77-
case ESP_HUK_INT_PREP_DONE:
78-
REG_SET_FIELD(HUK_INT_CLR_REG, HUK_PREP_DONE_INT_CLR, 1);
79-
case ESP_HUK_INT_PROC_DONE:
80-
REG_SET_FIELD(HUK_INT_CLR_REG, HUK_PROC_DONE_INT_CLR, 1);
81-
case ESP_HUK_INT_POST_DONE:
82-
REG_SET_FIELD(HUK_INT_CLR_REG, HUK_POST_DONE_INT_CLR, 1);
83-
default:
84-
return;
79+
switch (intr) {
80+
case ESP_HUK_INT_PREP_DONE:
81+
REG_SET_FIELD(HUK_INT_CLR_REG, HUK_PREP_DONE_INT_CLR, 1);
82+
break;
83+
case ESP_HUK_INT_PROC_DONE:
84+
REG_SET_FIELD(HUK_INT_CLR_REG, HUK_PROC_DONE_INT_CLR, 1);
85+
break;
86+
case ESP_HUK_INT_POST_DONE:
87+
REG_SET_FIELD(HUK_INT_CLR_REG, HUK_POST_DONE_INT_CLR, 1);
88+
break;
89+
default:
90+
return;
8591
}
8692
}
8793

@@ -108,7 +114,7 @@ static inline esp_huk_gen_status_t huk_ll_get_gen_status(void)
108114
*/
109115
static inline uint32_t huk_ll_get_date_info(void)
110116
{
111-
// Only the least siginificant 28 bits have desired information
117+
// Only the least significant 28 bits have desired information
112118
return (uint32_t)(0x0FFFFFFF & REG_READ(HUK_DATE_REG));
113119
}
114120

components/hal/esp32p4/include/hal/lp_i2s_ll.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
extern "C" {
2424
#endif
2525

26-
#define I2S_LL_GET_HW(num) (((num) == 0)? (&LP_I2S) : NULL)
26+
#define LP_I2S_LL_GET_HW(num) (((num) == 0)? (&LP_I2S) : NULL)
2727

2828
#define LP_I2S_LL_EVENT_RX_DONE_INT (1<<0)
2929
#define LP_I2S_LL_EVENT_RX_HUNG_INT_INT (1<<1)
@@ -146,7 +146,7 @@ static inline void lp_i2s_ll_clk_source_div_num(int id, uint32_t val)
146146
* @param a div a
147147
* @param b div b
148148
*/
149-
static inline void i2s_ll_tx_set_raw_clk_div(int id, uint32_t a, uint32_t b)
149+
static inline void lp_i2s_ll_tx_set_raw_clk_div(int id, uint32_t a, uint32_t b)
150150
{
151151
if (b <= a / 2) {
152152
LPPERI.lp_i2s_rxclk_div_xyz.lp_i2s_rx_clkm_div_yn1 = 0;
@@ -297,7 +297,7 @@ static inline void lp_i2s_ll_rx_enable_pdm(lp_i2s_dev_t *hw)
297297
/**
298298
* @brief Configure LP I2S rx channel bits and bits mode
299299
*/
300-
static inline void i2s_ll_rx_set_sample_bit(lp_i2s_dev_t *hw, int chan_bits, int bits_mode)
300+
static inline void lp_i2s_ll_rx_set_sample_bit(lp_i2s_dev_t *hw, int chan_bits, int bits_mode)
301301
{
302302
hw->rx_conf1.rx_tdm_chan_bits = chan_bits - 1;
303303
hw->rx_conf1.rx_bits_mod = bits_mode - 1;

0 commit comments

Comments
 (0)