Skip to content

Commit

Permalink
arch/stm32: Fix nxstyle errors
Browse files Browse the repository at this point in the history 
arch/arm/src/stm32/stm32_wwdg.c:

    * Fix nxstyle errors.
  • Loading branch information
@hartmannathan @Ouss4
hartmannathan authored and Ouss4 committed Dec 13, 2020
1 parent de1ad1f commit 705c64e
Showing 1 changed file with 42 additions and 35 deletions.
77 changes: 42 additions & 35 deletions arch/arm/src/stm32/stm32_wwdg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/

/* Clocking *****************************************************************/

/* The minimum frequency of the WWDG clock is:
*
* Fmin = PCLK1 / 4096 / 8
Expand Down Expand Up @@ -88,6 +90,7 @@
/****************************************************************************
* Private Types
****************************************************************************/

/* This structure provides the private representation of the "lower-half"
* driver state structure. This structure must be cast-compatible with the
* well-known watchdog_lowerhalf_s structure.
Expand All @@ -96,17 +99,18 @@
struct stm32_lowerhalf_s
{
FAR const struct watchdog_ops_s *ops; /* Lower half operations */
xcpt_t handler; /* Current EWI interrupt handler */
uint32_t timeout; /* The actual timeout value */
uint32_t fwwdg; /* WWDG clock frequency */
bool started; /* The timer has been started */
uint8_t reload; /* The 7-bit reload field reset value */
uint8_t window; /* The 7-bit window (W) field value */
xcpt_t handler; /* Current EWI interrupt handler */
uint32_t timeout; /* The actual timeout value */
uint32_t fwwdg; /* WWDG clock frequency */
bool started; /* The timer has been started */
uint8_t reload; /* The 7-bit reload field reset value */
uint8_t window; /* The 7-bit window (W) field value */
};

/****************************************************************************
* Private Function Prototypes
****************************************************************************/

/* Register operations ******************************************************/

#ifdef CONFIG_STM32_WWDG_REGDEBUG
Expand Down Expand Up @@ -140,6 +144,7 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
/****************************************************************************
* Private Data
****************************************************************************/

/* "Lower half" driver methods */

static const struct watchdog_ops_s g_wdgops =
Expand Down Expand Up @@ -180,8 +185,8 @@ static uint16_t stm32_getreg(uint32_t addr)

uint16_t val = getreg16(addr);

/* Is this the same value that we read from the same register last time? Are
* we polling the register? If so, suppress some of the output.
/* Is this the same value that we read from the same register last time?
* Are we polling the register? If so, suppress some of the output.
*/

if (addr == prevaddr && val == preval)
Expand All @@ -207,7 +212,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{
/* Yes.. then show how many times the value repeated */

wdinfo("[repeats %d more times]\n", count-3);
wdinfo("[repeats %d more times]\n", count - 3);
}

/* Save the new address, value, and count */
Expand Down Expand Up @@ -256,7 +261,8 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
*
****************************************************************************/

static void stm32_setwindow(FAR struct stm32_lowerhalf_s *priv, uint8_t window)
static void stm32_setwindow(FAR struct stm32_lowerhalf_s *priv,
uint8_t window)
{
uint16_t regval;

Expand Down Expand Up @@ -326,8 +332,8 @@ static int stm32_interrupt(int irq, FAR void *context, FAR void *arg)
* Start the watchdog timer, resetting the time to the current timeout,
*
* Input Parameters:
* lower - A pointer the publicly visible representation of the "lower-half"
* driver state structure.
* lower - A pointer the publicly visible representation of the "lower-
* half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
Expand Down Expand Up @@ -358,8 +364,8 @@ static int stm32_start(FAR struct watchdog_lowerhalf_s *lower)
* Stop the watchdog timer
*
* Input Parameters:
* lower - A pointer the publicly visible representation of the "lower-half"
* driver state structure.
* lower - A pointer the publicly visible representation of the "lower-
* half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
Expand All @@ -386,14 +392,14 @@ static int stm32_stop(FAR struct watchdog_lowerhalf_s *lower)
* the watchdog timer or "petting the dog".
*
* The application program must write in the WWDG_CR register at regular
* intervals during normal operation to prevent an MCU reset. This operation
* must occur only when the counter value is lower than the window register
* value. The value to be stored in the WWDG_CR register must be between
* 0xff and 0xC0:
* intervals during normal operation to prevent an MCU reset. This
* operation must occur only when the counter value is lower than the
* window register value. The value to be stored in the WWDG_CR register
* must be between 0xff and 0xC0:
*
* Input Parameters:
* lower - A pointer the publicly visible representation of the "lower-half"
* driver state structure.
* lower - A pointer the publicly visible representation of the "lower-
* half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
Expand Down Expand Up @@ -422,8 +428,8 @@ static int stm32_keepalive(FAR struct watchdog_lowerhalf_s *lower)
* Get the current watchdog timer status
*
* Input Parameters:
* lower - A pointer the publicly visible representation of the "lower-half"
* driver state structure.
* lower - A pointer the publicly visible representation of the "lower-
* half" driver state structure.
* status - The location to return the watchdog status information.
*
* Returned Value:
Expand Down Expand Up @@ -517,8 +523,8 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
* wdgtb is one of {1, 2, 4, or 8}
*/

/* Select the smallest prescaler that will result in a reload field value that is
* less than the maximum.
/* Select the smallest prescaler that will result in a reload field value
* that is less than the maximum.
*/

for (wdgtb = 0; ; wdgtb++)
Expand All @@ -531,7 +537,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,

/* Get the WWDG counter frequency in Hz. */

fwwdg = (STM32_PCLK1_FREQUENCY/4096) >> wdgtb;
fwwdg = (STM32_PCLK1_FREQUENCY / 4096) >> wdgtb;

/* The formula to calculate the timeout value is given by:
*
Expand Down Expand Up @@ -595,8 +601,8 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
regval |= (uint16_t)wdgtb << WWDG_CFR_WDGTB_SHIFT;
stm32_putreg(regval, STM32_WWDG_CFR);

/* Reset the 7-bit window value to the maximum value.. essentially disabling
* the lower limit of the watchdog reset time.
/* Reset the 7-bit window value to the maximum value.. essentially
* disabling the lower limit of the watchdog reset time.
*/

stm32_setwindow(priv, 0x7f);
Expand All @@ -612,8 +618,8 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
* behavior.
*
* Input Parameters:
* lower - A pointer the publicly visible representation of the "lower-half"
* driver state structure.
* lower - A pointer the publicly visible representation of the
* "lower-half" driver state structure.
* newhandler - The new watchdog expiration function pointer. If this
* function pointer is NULL, then the reset-on-expiration
* behavior is restored,
Expand Down Expand Up @@ -643,7 +649,7 @@ static xcpt_t stm32_capture(FAR struct watchdog_lowerhalf_s *lower,

/* Save the new handler */

priv->handler = handler;
priv->handler = handler;

/* Are we attaching or detaching the handler? */

Expand Down Expand Up @@ -679,8 +685,8 @@ static xcpt_t stm32_capture(FAR struct watchdog_lowerhalf_s *lower,
* are forwarded to the lower half driver through this method.
*
* Input Parameters:
* lower - A pointer the publicly visible representation of the "lower-half"
* driver state structure.
* lower - A pointer the publicly visible representation of the "lower-
* half" driver state structure.
* cmd - The ioctl command value
* arg - The optional argument that accompanies the 'cmd'. The
* interpretation of this argument depends on the particular
Expand Down Expand Up @@ -716,7 +722,8 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
ret = -EINVAL;
if (mintime < priv->timeout)
{
uint32_t window = (priv->timeout - mintime) * priv->fwwdg / 1000 - 1;
uint32_t window = (priv->timeout - mintime) * priv->fwwdg /
1000 - 1;
DEBUGASSERT(window < priv->reload);
stm32_setwindow(priv, window | WWDG_CR_T_RESET);
ret = OK;
Expand All @@ -734,8 +741,8 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
* Name: stm32_wwdginitialize
*
* Description:
* Initialize the WWDG watchdog timer. The watchdog timer is initialized and
* registers as 'devpath'. The initial state of the watchdog timer is
* Initialize the WWDG watchdog timer. The watchdog timer is initialized
* and registers as 'devpath'. The initial state of the watchdog timer is
* disabled.
*
* Input Parameters:
Expand Down

0 comments on commit 705c64e

Please sign in to comment.