michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: pwm: esp32: rename internal channel to avoid redeclaration

Browse source 
Unifying the method signature introduced a redeclaration of variables,
fixes redeclaration of variables by renaming the inner ones

Signed-off-by: Michael Schmitz <michaelschmitz@live.de>
This commit is contained in:
Michael Schmitz 2022-05-23 10:09:36 +02:00 • committed by Carles Cufí
commit 043a31a1c6
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/pwm/pwm_led_esp32.c
View file

@ -299,7 +299,7 @@ static int pwm_led_esp32_set_cycles(const struct device *dev, uint32_t channel,
uint32_t pulse_cycles, pwm_flags_t flags) uint32_t pulse_cycles, pwm_flags_t flags)
{ {
int speed_mode; int speed_mode;
int channel; int configured_channel;
int timer; int timer;
int ret; int ret;
const struct pwm_led_esp32_config * const config = const struct pwm_led_esp32_config * const config =
@ -312,18 +312,18 @@ static int pwm_led_esp32_set_cycles(const struct device *dev, uint32_t channel,
return -ENOTSUP; return -ENOTSUP;
} }
channel = pwm_led_esp32_get_gpio_config(channel, config->ch_cfg); configured_channel = pwm_led_esp32_get_gpio_config(channel, config->ch_cfg);
if (channel < 0) { if (configured_channel < 0) {
return -EINVAL; return -EINVAL;
} }
speed_mode = channel < 8 ? PWM_LED_ESP32_HIGH_SPEED : speed_mode = configured_channel < 8 ? PWM_LED_ESP32_HIGH_SPEED :
PWM_LED_ESP32_LOW_SPEED; PWM_LED_ESP32_LOW_SPEED;
timer = config->ch_cfg[channel].timer; timer = config->ch_cfg[configured_channel].timer;
/* Now we know which speed_mode and timer is set, then we will convert /* Now we know which speed_mode and timer is set, then we will convert
* the channel number from (0 - 15) to (0 - 7). * the channel number from (0 - 15) to (0 - 7).
*/ */
channel %= 8; configured_channel %= 8;
/* Enable peripheral */ /* Enable peripheral */
set_mask32(DPORT_LEDC_CLK_EN, DPORT_PERIP_CLK_EN_REG); set_mask32(DPORT_LEDC_CLK_EN, DPORT_PERIP_CLK_EN_REG);
@ -338,12 +338,12 @@ static int pwm_led_esp32_set_cycles(const struct device *dev, uint32_t channel,
} }
/* Set channel */ /* Set channel */
ret = pwm_led_esp32_channel_set(channel, speed_mode, channel, 0, timer); ret = pwm_led_esp32_channel_set(channel, speed_mode, configured_channel, 0, timer);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
pwm_led_esp32_duty_set(speed_mode, channel, pulse_cycles); pwm_led_esp32_duty_set(speed_mode, configured_channel, pulse_cycles);
pwm_led_esp32_update_duty(speed_mode, channel); pwm_led_esp32_update_duty(speed_mode, configured_channel);
return ret; return ret;
} }
@ -352,20 +352,20 @@ static int pwm_led_esp32_get_cycles_per_sec(const struct device *dev,
uint32_t channel, uint64_t *cycles) uint32_t channel, uint64_t *cycles)
{ {
const struct pwm_led_esp32_config *config; const struct pwm_led_esp32_config *config;
int channel; int configured_channel;
int timer; int timer;
int speed_mode; int speed_mode;
config = (const struct pwm_led_esp32_config *) dev->config; config = (const struct pwm_led_esp32_config *) dev->config;
channel = pwm_led_esp32_get_gpio_config(channel, config->ch_cfg); configured_channel = pwm_led_esp32_get_gpio_config(channel, config->ch_cfg);
if (channel < 0) { if (configured_channel < 0) {
return -EINVAL; return -EINVAL;
} }
speed_mode = channel < 8 ? PWM_LED_ESP32_HIGH_SPEED : speed_mode = configured_channel < 8 ? PWM_LED_ESP32_HIGH_SPEED :
PWM_LED_ESP32_LOW_SPEED; PWM_LED_ESP32_LOW_SPEED;
timer = config->ch_cfg[channel].timer; timer = config->ch_cfg[configured_channel].timer;
*cycles = config->timer_cfg[speed_mode][timer].freq; *cycles = config->timer_cfg[speed_mode][timer].freq;