This is an automated email from the ASF dual-hosted git repository.
xiaoxiang 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 4dda9800b4 espressif/mcpwm: fix compile error
4dda9800b4 is described below
commit 4dda9800b444cf60abfd0d071a424cc86911549a
Author: chao an <[email protected]>
AuthorDate: Tue Nov 26 09:05:56 2024 +0800
espressif/mcpwm: fix compile error
continue work of PR #14938
Signed-off-by: chao an <[email protected]>
---
arch/risc-v/src/common/espressif/esp_mcpwm.c | 14 +++++++-------
arch/xtensa/src/common/espressif/esp_mcpwm.c | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/risc-v/src/common/espressif/esp_mcpwm.c
b/arch/risc-v/src/common/espressif/esp_mcpwm.c
index dbec97e6f7..217535d2f8 100644
--- a/arch/risc-v/src/common/espressif/esp_mcpwm.c
+++ b/arch/risc-v/src/common/espressif/esp_mcpwm.c
@@ -1422,7 +1422,7 @@ static int esp_capture_start(struct cap_lowerhalf_s
*lower)
struct mcpwm_cap_channel_lowerhalf_s *)lower;
irqstate_t flags;
mcpwm_hal_context_t *hal = &priv->common->hal;
- flags = spin_lock_irqsave(priv->common->mcpwm_spinlock);
+ flags = spin_lock_irqsave(&priv->common->mcpwm_spinlock);
/* Enable channel and interruption for rising edge */
@@ -1444,7 +1444,7 @@ static int esp_capture_start(struct cap_lowerhalf_s
*lower)
priv->enabled = true;
priv->ready = false;
- spin_unlock_irqrestore(priv->common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&priv->common->mcpwm_spinlock, flags);
cpinfo("Channel enabled: %d\n", priv->channel_id);
return OK;
}
@@ -1474,7 +1474,7 @@ static int esp_capture_stop(struct cap_lowerhalf_s *lower)
struct mcpwm_cap_channel_lowerhalf_s *)lower;
irqstate_t flags;
mcpwm_hal_context_t *hal = &priv->common->hal;
- flags = spin_lock_irqsave(priv->common->mcpwm_spinlock);
+ flags = spin_lock_irqsave(&priv->common->mcpwm_spinlock);
/* Disable channel and interrupts */
@@ -1485,7 +1485,7 @@ static int esp_capture_stop(struct cap_lowerhalf_s *lower)
false);
priv->enabled = false;
- spin_unlock_irqrestore(priv->common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&priv->common->mcpwm_spinlock, flags);
cpinfo("Channel disabled: %d\n", priv->channel_id);
return OK;
}
@@ -1711,7 +1711,7 @@ static int IRAM_ATTR mcpwm_driver_isr_default(int irq,
void *context,
struct mcpwm_motor_lowerhalf_s *priv = NULL;
#endif
- flags = spin_lock_irqsave(common->mcpwm_spinlock);
+ flags = spin_lock_irqsave(&common->mcpwm_spinlock);
status = mcpwm_ll_intr_get_status(common->hal.dev);
/* Evaluate capture interrupt for all 3 cap channels */
@@ -1770,7 +1770,7 @@ static int IRAM_ATTR mcpwm_driver_isr_default(int irq,
void *context,
#ifdef CONFIG_ESP_MCPWM_CAPTURE
if (lower == NULL)
{
- spin_unlock_irqrestore(common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&common->mcpwm_spinlock, flags);
return OK;
}
@@ -1837,7 +1837,7 @@ static int IRAM_ATTR mcpwm_driver_isr_default(int irq,
void *context,
}
#endif
- spin_unlock_irqrestore(common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&common->mcpwm_spinlock, flags);
return OK;
}
#endif
diff --git a/arch/xtensa/src/common/espressif/esp_mcpwm.c
b/arch/xtensa/src/common/espressif/esp_mcpwm.c
index a20c6e53f7..e2144c5520 100644
--- a/arch/xtensa/src/common/espressif/esp_mcpwm.c
+++ b/arch/xtensa/src/common/espressif/esp_mcpwm.c
@@ -1446,7 +1446,7 @@ static int esp_capture_start(struct cap_lowerhalf_s
*lower)
struct mcpwm_cap_channel_lowerhalf_s *)lower;
mcpwm_hal_context_t *hal = &priv->common->hal;
irqstate_t flags;
- flags = spin_lock_irqsave(priv->common->mcpwm_spinlock);
+ flags = spin_lock_irqsave(&priv->common->mcpwm_spinlock);
DEBUGASSERT(priv->common->initialized);
@@ -1471,7 +1471,7 @@ static int esp_capture_start(struct cap_lowerhalf_s
*lower)
priv->ready = false;
cpinfo("Channel enabled: %d\n", priv->channel_id);
- spin_unlock_irqrestore(priv->common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&priv->common->mcpwm_spinlock, flags);
return OK;
}
@@ -1499,7 +1499,7 @@ static int esp_capture_stop(struct cap_lowerhalf_s *lower)
struct mcpwm_cap_channel_lowerhalf_s *)lower;
mcpwm_hal_context_t *hal = &priv->common->hal;
irqstate_t flags;
- flags = spin_lock_irqsave(priv->common->mcpwm_spinlock);
+ flags = spin_lock_irqsave(&priv->common->mcpwm_spinlock);
/* Disable channel and interrupts */
@@ -1511,7 +1511,7 @@ static int esp_capture_stop(struct cap_lowerhalf_s *lower)
priv->enabled = false;
cpinfo("Channel disabled: %d\n", priv->channel_id);
- spin_unlock_irqrestore(priv->common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&priv->common->mcpwm_spinlock, flags);
return OK;
}
@@ -1701,7 +1701,7 @@ static int IRAM_ATTR mcpwm_driver_isr_default(int irq,
void *context,
struct mcpwm_motor_lowerhalf_s *priv = NULL;
#endif
- flags = spin_lock_irqsave(common->mcpwm_spinlock);
+ flags = spin_lock_irqsave(&common->mcpwm_spinlock);
status = mcpwm_ll_intr_get_status(common->hal.dev);
/* Evaluate capture interrupt for all 3 cap channels */
@@ -1758,7 +1758,7 @@ static int IRAM_ATTR mcpwm_driver_isr_default(int irq,
void *context,
#ifdef CONFIG_ESP_MCPWM_CAPTURE
if (lower == NULL)
{
- spin_unlock_irqrestore(common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&common->mcpwm_spinlock, flags);
return OK;
}
@@ -1823,7 +1823,7 @@ static int IRAM_ATTR mcpwm_driver_isr_default(int irq,
void *context,
}
#endif
- spin_unlock_irqrestore(common->mcpwm_spinlock, flags);
+ spin_unlock_irqrestore(&common->mcpwm_spinlock, flags);
return OK;
}
#endif
