sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

samv7: fix compile warning in PWM and UART drivers

Browse Source 
The following warnings is fixed:

chip/sam_pwm.c:961:12: warning: unused variable 'regval' [-Wunused-variable]
  961 |   uint32_t regval;

chip/sam_serial.c: In function 'sam_dma_txavailable':
chip/sam_serial.c:2264:7: warning: unused variable 'rv' [-Wunused-variable]
 2264 |   int rv;

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
This commit is contained in:
Michal Lenc 2024-07-12 10:08:37 +02:00 committed by Petro Karashchenko
parent 2bc97c0f0e
commit 5c48944e0b
2 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
arch/arm/src/samv7/sam_pwm.c
View File

@ -957,93 +957,93 @@ static int pwm_start(struct pwm_lowerhalf_s *dev,
const struct pwm_info_s *info) const struct pwm_info_s *info)
{ {
struct sam_pwm_s *priv = (struct sam_pwm_s *)dev; struct sam_pwm_s *priv = (struct sam_pwm_s *)dev;
#ifdef CONFIG_PWM_MULTICHAN
uint32_t regval; uint32_t regval;
#ifdef CONFIG_PWM_MULTICHAN for (int i = 0; i < PWM_NCHANNELS; i++)
for (int i = 0; i < PWM_NCHANNELS; i++) {
int8_t index = info->channels[i].channel;
/* Break the loop if all following channels are not configured */
if (index == -1)
{ {
int8_t index = info->channels[i].channel; break;
}
/* Break the loop if all following channels are not configured */ /* Configure the module freq only if is set to be used */
if (index == -1) if (index > 0 && (index - 1) < priv->channels_num)
{ {
break; /* Set the frequency and enable PWM output for each channel */
}
/* Configure the module freq only if is set to be used */ pwm_set_freq(dev, priv->channels[index - 1].channel,
info->frequency);
if (index > 0 && (index - 1) < priv->channels_num)
{
/* Set the frequency and enable PWM output for each channel */
pwm_set_freq(dev, priv->channels[index - 1].channel,
info->frequency);
#ifdef CONFIG_PWM_DEADTIME #ifdef CONFIG_PWM_DEADTIME
pwm_set_deadtime(dev, priv->channels[index - 1].channel, pwm_set_deadtime(dev, priv->channels[index - 1].channel,
info->channels[i].dead_time_a, info->channels[i].dead_time_a,
info->channels[i].dead_time_b, info->channels[i].dead_time_b,
info->channels[i].duty); info->channels[i].duty);
#endif #endif
pwm_set_polarity(dev, priv->channels[index - 1].channel, pwm_set_polarity(dev, priv->channels[index - 1].channel,
info->channels[i].cpol, info->channels[i].cpol,
info->channels[i].dcpol); info->channels[i].dcpol);
pwm_set_output(dev, priv->channels[index - 1].channel, pwm_set_output(dev, priv->channels[index - 1].channel,
info->channels[i].duty); info->channels[i].duty);
#ifdef CONFIG_PWM_OVERWRITE #ifdef CONFIG_PWM_OVERWRITE
if (info->channels[i].ch_outp_ovrwr) if (info->channels[i].ch_outp_ovrwr)
{ {
regval = pwm_getreg(priv, SAMV7_PWM_OOV); regval = pwm_getreg(priv, SAMV7_PWM_OOV);
regval &= ~(info->channels[i].ch_outp_ovrwr_val regval &= ~(info->channels[i].ch_outp_ovrwr_val
<< priv->channels[i].channel); << priv->channels[i].channel);
pwm_putreg(priv, SAMV7_PWM_OOV, regval); pwm_putreg(priv, SAMV7_PWM_OOV, regval);
regval = (1 << priv->channels[i].channel); regval = (1 << priv->channels[i].channel);
pwm_putreg(priv, SAMV7_PWM_OSS, regval); pwm_putreg(priv, SAMV7_PWM_OSS, regval);
}
else
{
/* Release overwrite of channel */
regval = (1 << priv->channels[i].channel);
pwm_putreg(priv, SAMV7_PWM_OSC, regval);
}
#endif
} }
else
{
/* Release overwrite of channel */
regval = (1 << priv->channels[i].channel);
pwm_putreg(priv, SAMV7_PWM_OSC, regval);
}
#endif
} }
}
/* Perform the update of synchronized PWM channels */ /* Perform the update of synchronized PWM channels */
if (priv->sync) if (priv->sync)
{ {
regval = SCUC_UPDULOCK; regval = SCUC_UPDULOCK;
/* Enable the Channel 0 if synchronous channels are used. /* Enable the Channel 0 if synchronous channels are used.
* Channel 0's counter is used by all synchronous channels and * Channel 0's counter is used by all synchronous channels and
* enabling CH0 results in enabling all synchronous channels. * enabling CH0 results in enabling all synchronous channels.
* *
* Enable the CH0 here after all setting all channel parameters, * Enable the CH0 here after all setting all channel parameters,
* because setting polarity configurations requires disabled * because setting polarity configurations requires disabled
* channels. * channels.
*/ */
pwm_putreg(priv, SAMV7_PWM_ENA, CHID_SEL(1)); pwm_putreg(priv, SAMV7_PWM_ENA, CHID_SEL(1));
pwm_putreg(priv, SAMV7_PWM_SCUC, regval); pwm_putreg(priv, SAMV7_PWM_SCUC, regval);
} }
#else #else
/* Set the frequency and enable PWM output just for first channel */ /* Set the frequency and enable PWM output just for first channel */
pwm_set_freq(dev, priv->channels[0].channel, info->frequency); pwm_set_freq(dev, priv->channels[0].channel, info->frequency);
#ifdef CONFIG_PWM_DEADTIME #ifdef CONFIG_PWM_DEADTIME
pwm_set_deadtime(dev, priv->channels[0].channel, pwm_set_deadtime(dev, priv->channels[0].channel,
info->dead_time_a, info->dead_time_b); info->dead_time_a, info->dead_time_b);
#endif #endif
pwm_set_polarity(dev, priv->channels[0].channel, pwm_set_polarity(dev, priv->channels[0].channel,
info->cpol, info->dcpol); info->cpol, info->dcpol);
pwm_set_output(dev, priv->channels[0].channel, info->duty); pwm_set_output(dev, priv->channels[0].channel, info->duty);
#endif #endif
pwm_set_comparison(dev); pwm_set_comparison(dev);
return OK; return OK;
} }

1
arch/arm/src/samv7/sam_serial.c
View File

@ -2261,7 +2261,6 @@ static void sam_dma_txint(struct uart_dev_s *dev, bool enable)
static void sam_dma_txavailable(struct uart_dev_s *dev) static void sam_dma_txavailable(struct uart_dev_s *dev)
{ {
struct sam_dev_s *priv = (struct sam_dev_s *)dev->priv; struct sam_dev_s *priv = (struct sam_dev_s *)dev->priv;
int rv;
/* Only send when the DMA is idle */ /* Only send when the DMA is idle */