From 880d6916b3fb25b3972ed78b380db630524623e7 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 3 Mar 2015 15:08:54 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7713 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/pal.h | 34 ++++++++++++------------ os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h | 46 ++++++++++++++++----------------- 2 files changed, 40 insertions(+), 40 deletions(-) (limited to 'os/hal') diff --git a/os/hal/include/pal.h b/os/hal/include/pal.h index d6c13ceb4..e78ed3491 100644 --- a/os/hal/include/pal.h +++ b/os/hal/include/pal.h @@ -44,7 +44,7 @@ * it is guaranteed to be equal to the after-reset state. It is * usually an input state. */ -#define PAL_MODE_RESET 0 +#define PAL_MODE_RESET 0U /** * @brief Safe state for unconnected pads. @@ -53,37 +53,37 @@ * @p PAL_MODE_INPUT_PULLDOWN or @p PAL_MODE_OUTPUT_PUSHPULL for * example. */ -#define PAL_MODE_UNCONNECTED 1 +#define PAL_MODE_UNCONNECTED 1U /** * @brief Regular input high-Z pad. */ -#define PAL_MODE_INPUT 2 +#define PAL_MODE_INPUT 2U /** * @brief Input pad with weak pull up resistor. */ -#define PAL_MODE_INPUT_PULLUP 3 +#define PAL_MODE_INPUT_PULLUP 3U /** * @brief Input pad with weak pull down resistor. */ -#define PAL_MODE_INPUT_PULLDOWN 4 +#define PAL_MODE_INPUT_PULLDOWN 4U /** * @brief Analog input mode. */ -#define PAL_MODE_INPUT_ANALOG 5 +#define PAL_MODE_INPUT_ANALOG 5U /** * @brief Push-pull output pad. */ -#define PAL_MODE_OUTPUT_PUSHPULL 6 +#define PAL_MODE_OUTPUT_PUSHPULL 6U /** * @brief Open-drain output pad. */ -#define PAL_MODE_OUTPUT_OPENDRAIN 7 +#define PAL_MODE_OUTPUT_OPENDRAIN 7U /** @} */ /** @@ -93,12 +93,12 @@ /** * @brief Logical low state. */ -#define PAL_LOW 0 +#define PAL_LOW 0U /** * @brief Logical high state. */ -#define PAL_HIGH 1 +#define PAL_HIGH 1U /** @} */ /*===========================================================================*/ @@ -151,7 +151,7 @@ typedef struct { * @return The bit mask. */ #if !defined(PAL_PORT_BIT) || defined(__DOXYGEN__) -#define PAL_PORT_BIT(n) ((ioportmask_t)(1 << (n))) +#define PAL_PORT_BIT(n) ((ioportmask_t)(1U << (n))) #endif /** @@ -162,7 +162,7 @@ typedef struct { * @return The group mask. */ #if !defined(PAL_GROUP_MASK) || defined(__DOXYGEN__) -#define PAL_GROUP_MASK(width) ((ioportmask_t)(1 << (width)) - 1) +#define PAL_GROUP_MASK(width) ((ioportmask_t)(1U << (width)) - 1U) #endif /** @@ -218,7 +218,7 @@ typedef struct { * @special */ #if !defined(pal_lld_readport) || defined(__DOXYGEN__) -#define palReadPort(port) ((void)(port), 0) +#define palReadPort(port) ((void)(port), 0U) #else #define palReadPort(port) pal_lld_readport(port) #endif @@ -237,7 +237,7 @@ typedef struct { * @special */ #if !defined(pal_lld_readlatch) || defined(__DOXYGEN__) -#define palReadLatch(port) ((void)(port), 0) +#define palReadLatch(port) ((void)(port), 0U) #else #define palReadLatch(port) pal_lld_readlatch(port) #endif @@ -408,7 +408,7 @@ typedef struct { * @special */ #if !defined(pal_lld_readpad) || defined(__DOXYGEN__) -#define palReadPad(port, pad) ((palReadPort(port) >> (pad)) & 1) +#define palReadPad(port, pad) ((palReadPort(port) >> (pad)) & 1U) #else #define palReadPad(port, pad) pal_lld_readpad(port, pad) #endif @@ -436,7 +436,7 @@ typedef struct { #if !defined(pal_lld_writepad) || defined(__DOXYGEN__) #define palWritePad(port, pad, bit) \ palWritePort(port, (palReadLatch(port) & ~PAL_PORT_BIT(pad)) | \ - (((bit) & 1) << pad)) + (((bit) & 1U) << pad)) #else #define palWritePad(port, pad, bit) pal_lld_writepad(port, pad, bit) #endif @@ -527,7 +527,7 @@ typedef struct { */ #if !defined(pal_lld_setpadmode) || defined(__DOXYGEN__) #define palSetPadMode(port, pad, mode) \ - palSetGroupMode(port, PAL_PORT_BIT(pad), 0, mode) + palSetGroupMode(port, PAL_PORT_BIT(pad), 0U, mode) #else #define palSetPadMode(port, pad, mode) pal_lld_setpadmode(port, pad, mode) #endif diff --git a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h index 78e4cdf5c..6165530c4 100644 --- a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h +++ b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h @@ -44,33 +44,33 @@ * @name STM32-specific I/O mode flags * @{ */ -#define PAL_STM32_MODE_MASK (3 << 0) -#define PAL_STM32_MODE_INPUT (0 << 0) -#define PAL_STM32_MODE_OUTPUT (1 << 0) -#define PAL_STM32_MODE_ALTERNATE (2 << 0) -#define PAL_STM32_MODE_ANALOG (3 << 0) - -#define PAL_STM32_OTYPE_MASK (1 << 2) -#define PAL_STM32_OTYPE_PUSHPULL (0 << 2) -#define PAL_STM32_OTYPE_OPENDRAIN (1 << 2) - -#define PAL_STM32_OSPEED_MASK (3 << 3) -#define PAL_STM32_OSPEED_LOWEST (0 << 3) +#define PAL_STM32_MODE_MASK (3U << 0U) +#define PAL_STM32_MODE_INPUT (0U << 0U) +#define PAL_STM32_MODE_OUTPUT (1U << 0U) +#define PAL_STM32_MODE_ALTERNATE (2U << 0U) +#define PAL_STM32_MODE_ANALOG (3U << 0U) + +#define PAL_STM32_OTYPE_MASK (1U << 2U) +#define PAL_STM32_OTYPE_PUSHPULL (0U << 2U) +#define PAL_STM32_OTYPE_OPENDRAIN (1U << 2U) + +#define PAL_STM32_OSPEED_MASK (3U << 3U) +#define PAL_STM32_OSPEED_LOWEST (0U << 3U) #if defined(STM32F0XX) || defined(STM32F30X) || defined(STM32F37X) -#define PAL_STM32_OSPEED_MID (1 << 3) +#define PAL_STM32_OSPEED_MID (1U << 3U) #else -#define PAL_STM32_OSPEED_MID1 (1 << 3) -#define PAL_STM32_OSPEED_MID2 (2 << 3) +#define PAL_STM32_OSPEED_MID1 (1U << 3U) +#define PAL_STM32_OSPEED_MID2 (2U << 3U) #endif -#define PAL_STM32_OSPEED_HIGHEST (3 << 3) +#define PAL_STM32_OSPEED_HIGHEST (3U << 3U) -#define PAL_STM32_PUDR_MASK (3 << 5) -#define PAL_STM32_PUDR_FLOATING (0 << 5) -#define PAL_STM32_PUDR_PULLUP (1 << 5) -#define PAL_STM32_PUDR_PULLDOWN (2 << 5) +#define PAL_STM32_PUDR_MASK (3U << 5U) +#define PAL_STM32_PUDR_FLOATING (0U << 5U) +#define PAL_STM32_PUDR_PULLUP (1U << 5U) +#define PAL_STM32_PUDR_PULLDOWN (2U << 5U) -#define PAL_STM32_ALTERNATE_MASK (15 << 7) -#define PAL_STM32_ALTERNATE(n) ((n) << 7) +#define PAL_STM32_ALTERNATE_MASK (15U << 7U) +#define PAL_STM32_ALTERNATE(n) ((n) << 7U) /** * @brief Alternate function. @@ -441,7 +441,7 @@ typedef stm32_gpio_t * ioportid_t; * @notapi */ #define pal_lld_writegroup(port, mask, offset, bits) \ - ((port)->BSRR.W = ((~(bits) & (mask)) << (16 + (offset))) | \ + ((port)->BSRR.W = ((~(bits) & (mask)) << (16U + (offset))) | \ (((bits) & (mask)) << (offset))) /** -- cgit v1.2.3