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

arch/arm/src/s32k1xx: Fix warnings in PWM code.

Browse Source
This commit is contained in:
Carlos Sanchez 2023-10-02 12:19:00 +02:00 committed by Xiang Xiao
parent 33cfd630ad
commit f3576a41f5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/s32k1xx/hardware/s32k1xx_ftm.h
View File

@ -590,7 +590,7 @@
#define FTM_SC_PWMEN_SHIFT (16) /* Bits 16-23: Channel n PWM enable bit */
#define FTM_SC_PWMEN_MASK (0xff << FTM_SC_PWMEN_SHIFT)
#define FTM_SC_PWMEN(n) (1 << FTM_SC_PWMEN_SHIFT + (n))
#define FTM_SC_PWMEN(n) (1 << (FTM_SC_PWMEN_SHIFT + (n)))
#define FTM_SC_FLTPS_SHIFT (24) /* Bits 24-27: Filter Prescaler */
#define FTM_SC_FLTPS_MASK (0x07 << FTM_SC_FLTPS_SHIFT)
# define FTM_SC_FLTPS_DIV1 (0 << FTM_SC_FLTPS_SHIFT) /* Divide by 1 */

10
arch/arm/src/s32k1xx/s32k1xx_pwm.c
View File

@ -357,7 +357,7 @@ static int pwm_timer(struct s32k1xx_pwmtimer_s *priv,
DEBUGASSERT(priv != NULL && info != NULL);
pwminfo("FTM%d channel: %d frequency: %d duty: %08x\n",
pwminfo("FTM%d channel: %d frequency: %" PRId32 " duty: %08" PRIx32 "\n",
priv->tpmid, priv->channel, info->frequency, info->duty);
DEBUGASSERT(info->frequency > 0 && info->duty > 0 &&
@ -427,8 +427,8 @@ static int pwm_timer(struct s32k1xx_pwmtimer_s *priv,
cv = b16toi(info->duty * modulo + b16HALF);
pwminfo("FTM%d PCLK: %d frequency: %d FTMCLK: %d prescaler: %d modulo: %d \
c0v: %d\n",
pwminfo("FTM%d PCLK: %" PRId32 " frequency: %" PRId32 " FTMCLK: %" PRId32
" prescaler: %d modulo: %" PRId32 "c0v: %" PRId32 "\n",
priv->tpmid, priv->pclk, info->frequency, tpmclk,
presc_values[prescaler], modulo, cv);
@ -554,7 +554,7 @@ static int pwm_setup(struct pwm_lowerhalf_s *dev)
* already be enabled in the board-specific s32k1xx_periphclocks.c file.
*/
pwminfo("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
pwminfo("FTM%d pincfg: %08" PRIx32 "\n", priv->tpmid, priv->pincfg);
pwm_dumpregs(priv, "Initially");
/* Configure the PWM output pin, but do not start the timer yet */
@ -585,7 +585,7 @@ static int pwm_shutdown(struct pwm_lowerhalf_s *dev)
struct s32k1xx_pwmtimer_s *priv = (struct s32k1xx_pwmtimer_s *)dev;
uint32_t pincfg;
pwminfo("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
pwminfo("FTM%d pincfg: %08" PRIx32 "\n", priv->tpmid, priv->pincfg);
/* Make sure that the output has been stopped */