This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 53548509b1 fix build error
53548509b1 is described below
commit 53548509b1a14ba8e904f2fad75d33d11d11e6f3
Author: hujun5 <huj...@xiaomi.com>
AuthorDate: Tue Nov 26 07:25:55 2024 +0800
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 <huj...@xiaomi.com>
---
arch/risc-v/src/common/espressif/esp_rmt.c | 22 +++++++++++-----------
arch/xtensa/src/common/espressif/esp_rmt.c | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/risc-v/src/common/espressif/esp_rmt.c
b/arch/risc-v/src/common/espressif/esp_rmt.c
index d1af3861aa..d5f05e31b7 100644
--- a/arch/risc-v/src/common/espressif/esp_rmt.c
+++ b/arch/risc-v/src/common/espressif/esp_rmt.c
@@ -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);
diff --git a/arch/xtensa/src/common/espressif/esp_rmt.c
b/arch/xtensa/src/common/espressif/esp_rmt.c
index 2a62719967..f2ae63009d 100644
--- a/arch/xtensa/src/common/espressif/esp_rmt.c
+++ b/arch/xtensa/src/common/espressif/esp_rmt.c
@@ -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);
