fix build error
common/espressif/esp_rmt.c: In function 'rmt_set_tx_thr_intr_en': common/espressif/esp_rmt.c:654:48: error: passing argument 1 of 'spin_lock_irqsave' makes pointer from integer without a cast [-Werror=int-conversion] 654 | flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~ | | | spinlock_t {aka unsigned char} /home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:617:55: note: expected 'volatile spinlock_t *' {aka 'volatile unsigned char *'} but argument is of type 'spinlock_t' {aka 'unsigned char'} 617 | irqstate_t spin_lock_irqsave(FAR volatile spinlock_t *lock) | ~~~~~~~~~~~~~~~~~~~~~^~~~ CC: nsh_script.c common/espressif/esp_rmt.c:662:48: error: passing argument 1 of 'spin_lock_irqsave' makes pointer from integer without a cast [-Werror=int-conversion] 662 | flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~ | | | spinlock_t {aka unsigned char} /home/hujun5/downloads1/vela_sim/nuttx/include/nuttx/spinlock.h:617:55: note: expected ' Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
parent
92b9a30878
commit
53548509b1
2 changed files with 22 additions and 22 deletions
|
@ -403,7 +403,7 @@ static void rmt_module_enable(void)
|
|||
{
|
||||
irqstate_t flags;
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
|
||||
if (g_rmtdev_common.rmt_module_enabled == false)
|
||||
{
|
||||
|
@ -454,7 +454,7 @@ static int rmt_set_rx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_rx_set_limit(g_rmtdev_common.hal.regs,
|
||||
RMT_DECODE_RX_CHANNEL(channel), evt_thresh);
|
||||
mask = RMT_LL_EVENT_RX_THRES(RMT_DECODE_RX_CHANNEL(channel));
|
||||
|
@ -463,7 +463,7 @@ static int rmt_set_rx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
}
|
||||
else
|
||||
{
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
mask = RMT_LL_EVENT_RX_THRES(RMT_DECODE_RX_CHANNEL(channel));
|
||||
rmt_ll_enable_interrupt(g_rmtdev_common.hal.regs, mask, false);
|
||||
spin_unlock_irqrestore(&g_rmtdev_common.rmt_spinlock, flags);
|
||||
|
@ -504,7 +504,7 @@ static int rmt_rx_start(rmt_channel_t channel, bool rx_idx_rst)
|
|||
|
||||
DEBUGASSERT(RMT_IS_RX_CHANNEL(channel));
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
|
||||
rmt_ll_rx_enable(g_rmtdev_common.hal.regs, ch, false);
|
||||
if (rx_idx_rst)
|
||||
|
@ -551,7 +551,7 @@ static int rmt_tx_start(rmt_channel_t channel, bool tx_idx_rst)
|
|||
|
||||
DEBUGASSERT(RMT_IS_TX_CHANNEL(channel));
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
if (tx_idx_rst)
|
||||
{
|
||||
rmt_ll_tx_reset_pointer(g_rmtdev_common.hal.regs, channel);
|
||||
|
@ -609,7 +609,7 @@ static int rmt_set_tx_loop_mode(rmt_channel_t channel, bool loop_en)
|
|||
|
||||
DEBUGASSERT(RMT_IS_TX_CHANNEL(channel));
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_tx_enable_loop(g_rmtdev_common.hal.regs, channel, loop_en);
|
||||
spin_unlock_irqrestore(&g_rmtdev_common.rmt_spinlock, flags);
|
||||
|
||||
|
@ -651,7 +651,7 @@ static int rmt_set_tx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
|
||||
DEBUGASSERT(evt_thresh <= item_block_len);
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_tx_set_limit(g_rmtdev_common.hal.regs, channel, evt_thresh);
|
||||
rmt_ll_enable_interrupt(g_rmtdev_common.hal.regs,
|
||||
RMT_LL_EVENT_TX_THRES(channel), true);
|
||||
|
@ -659,7 +659,7 @@ static int rmt_set_tx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
}
|
||||
else
|
||||
{
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_enable_interrupt(g_rmtdev_common.hal.regs,
|
||||
RMT_LL_EVENT_TX_THRES(channel), false);
|
||||
spin_unlock_irqrestore(&g_rmtdev_common.rmt_spinlock, flags);
|
||||
|
@ -801,7 +801,7 @@ static int rmt_internal_config(rmt_dev_t *dev,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
|
||||
rmt_ll_enable_mem_access_nonfifo(dev, true);
|
||||
|
||||
|
@ -866,7 +866,7 @@ static int rmt_internal_config(rmt_dev_t *dev,
|
|||
uint8_t carrier_level = rmt_param->tx_config.carrier_level;
|
||||
uint8_t idle_level = rmt_param->tx_config.idle_level;
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_tx_set_channel_clock_div(dev, channel, clk_div);
|
||||
rmt_ll_tx_set_mem_blocks(dev, channel, mem_cnt);
|
||||
rmt_ll_tx_reset_pointer(dev, channel);
|
||||
|
@ -918,7 +918,7 @@ static int rmt_internal_config(rmt_dev_t *dev,
|
|||
uint8_t filter_cnt = rmt_param->rx_config.filter_ticks_thresh;
|
||||
uint16_t threshold = rmt_param->rx_config.idle_threshold;
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_rx_set_channel_clock_div(dev, RMT_DECODE_RX_CHANNEL(channel),
|
||||
clk_div);
|
||||
rmt_ll_rx_set_mem_blocks(dev, RMT_DECODE_RX_CHANNEL(channel), mem_cnt);
|
||||
|
|
|
@ -449,7 +449,7 @@ static void rmt_module_enable(void)
|
|||
{
|
||||
irqstate_t flags;
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
|
||||
if (g_rmtdev_common.rmt_module_enabled == false)
|
||||
{
|
||||
|
@ -501,7 +501,7 @@ static int rmt_set_rx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_rx_set_limit(g_rmtdev_common.hal.regs,
|
||||
RMT_DECODE_RX_CHANNEL(channel), evt_thresh);
|
||||
mask = RMT_LL_EVENT_RX_THRES(RMT_DECODE_RX_CHANNEL(channel));
|
||||
|
@ -510,7 +510,7 @@ static int rmt_set_rx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
}
|
||||
else
|
||||
{
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
mask = RMT_LL_EVENT_RX_THRES(RMT_DECODE_RX_CHANNEL(channel));
|
||||
rmt_ll_enable_interrupt(g_rmtdev_common.hal.regs, mask, false);
|
||||
spin_unlock_irqrestore(&g_rmtdev_common.rmt_spinlock, flags);
|
||||
|
@ -551,7 +551,7 @@ static int rmt_rx_start(rmt_channel_t channel, bool rx_idx_rst)
|
|||
|
||||
DEBUGASSERT(RMT_IS_RX_CHANNEL(channel));
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
|
||||
rmt_ll_rx_enable(g_rmtdev_common.hal.regs, ch, false);
|
||||
if (rx_idx_rst)
|
||||
|
@ -598,7 +598,7 @@ static int rmt_tx_start(rmt_channel_t channel, bool tx_idx_rst)
|
|||
|
||||
DEBUGASSERT(RMT_IS_TX_CHANNEL(channel));
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
if (tx_idx_rst)
|
||||
{
|
||||
rmt_ll_tx_reset_pointer(g_rmtdev_common.hal.regs, channel);
|
||||
|
@ -656,7 +656,7 @@ static int rmt_set_tx_loop_mode(rmt_channel_t channel, bool loop_en)
|
|||
|
||||
DEBUGASSERT(RMT_IS_TX_CHANNEL(channel));
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_tx_enable_loop(g_rmtdev_common.hal.regs, channel, loop_en);
|
||||
spin_unlock_irqrestore(&g_rmtdev_common.rmt_spinlock, flags);
|
||||
|
||||
|
@ -698,7 +698,7 @@ static int rmt_set_tx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
|
||||
DEBUGASSERT(evt_thresh <= item_block_len);
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_tx_set_limit(g_rmtdev_common.hal.regs, channel, evt_thresh);
|
||||
rmt_ll_enable_interrupt(g_rmtdev_common.hal.regs,
|
||||
RMT_LL_EVENT_TX_THRES(channel), true);
|
||||
|
@ -706,7 +706,7 @@ static int rmt_set_tx_thr_intr_en(rmt_channel_t channel, bool en,
|
|||
}
|
||||
else
|
||||
{
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_enable_interrupt(g_rmtdev_common.hal.regs,
|
||||
RMT_LL_EVENT_TX_THRES(channel), false);
|
||||
spin_unlock_irqrestore(&g_rmtdev_common.rmt_spinlock, flags);
|
||||
|
@ -848,7 +848,7 @@ static int rmt_internal_config(rmt_dev_t *dev,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
|
||||
rmt_ll_enable_mem_access_nonfifo(dev, true);
|
||||
|
||||
|
@ -913,7 +913,7 @@ static int rmt_internal_config(rmt_dev_t *dev,
|
|||
uint8_t carrier_level = rmt_param->tx_config.carrier_level;
|
||||
uint8_t idle_level = rmt_param->tx_config.idle_level;
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_tx_set_channel_clock_div(dev, channel, clk_div);
|
||||
rmt_ll_tx_set_mem_blocks(dev, channel, mem_cnt);
|
||||
rmt_ll_tx_reset_pointer(dev, channel);
|
||||
|
@ -965,7 +965,7 @@ static int rmt_internal_config(rmt_dev_t *dev,
|
|||
uint8_t filter_cnt = rmt_param->rx_config.filter_ticks_thresh;
|
||||
uint16_t threshold = rmt_param->rx_config.idle_threshold;
|
||||
|
||||
flags = spin_lock_irqsave(g_rmtdev_common.rmt_spinlock);
|
||||
flags = spin_lock_irqsave(&g_rmtdev_common.rmt_spinlock);
|
||||
rmt_ll_rx_set_channel_clock_div(dev, RMT_DECODE_RX_CHANNEL(channel),
|
||||
clk_div);
|
||||
rmt_ll_rx_set_mem_blocks(dev, RMT_DECODE_RX_CHANNEL(channel), mem_cnt);
|
||||
|
|
Loading…
Reference in a new issue