luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

espressif/mcpwm: fix compile error

Browse source 
continue work of PR #14938

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-11-26 09:05:56 +08:00 • committed by Xiang Xiao
parent 5fabe091f3
commit 4dda9800b4
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/risc-v/src/common/espressif/esp_mcpwm.c
View file

@ -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

14
arch/xtensa/src/common/espressif/esp_mcpwm.c
View file

@ -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