andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved type robustness of STM32 GPIO PAL drivers. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12393 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
gdisirio 2018-10-27 11:37:59 +00:00
parent 79ca268b49
commit dde82c6051
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.h
View File

@ -252,7 +252,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_readport(port) ((port)->IDR)
#define pal_lld_readport(port) ((ioportmask_t)((port)->IDR))
/**
* @brief Reads the output latch.
@ -266,7 +266,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_readlatch(port) ((port)->ODR)
#define pal_lld_readlatch(port) ((ioportmask_t)((port)->ODR))
/**
* @brief Writes on a I/O port.
@ -281,7 +281,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_writeport(port, bits) ((port)->ODR = (bits))
#define pal_lld_writeport(port, bits) ((port)->ODR = (uint32_t)(bits))
/**
* @brief Sets a bits mask on a I/O port.
@ -296,7 +296,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_setport(port, bits) ((port)->BSRR = (bits))
#define pal_lld_setport(port, bits) ((port)->BSRR = (uint32_t)(bits))
/**
* @brief Clears a bits mask on a I/O port.
@ -311,7 +311,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_clearport(port, bits) ((port)->BRR = (bits))
#define pal_lld_clearport(port, bits) ((port)->BRR = (uint32_t)(bits))
/**
* @brief Writes a group of bits.
@ -329,9 +329,11 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_writegroup(port, mask, offset, bits) \
((port)->BSRR = ((~(bits) & (mask)) << (16 + (offset))) | \
(((bits) & (mask)) << (offset)))
#define pal_lld_writegroup(port, mask, offset, bits) { \
uint32_t w = ((~(uint32_t)(bits) & (uint32_t)(mask)) << (16U + (offset))) | \
((uint32_t)(bits) & (uint32_t)(mask)) << (offset); \
(port)->BSRR = w; \
}
/**
* @brief Pads group mode setup.

14
os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.h
View File

@ -328,7 +328,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_readport(port) ((port)->IDR)
#define pal_lld_readport(port) ((ioportmask_t)((port)->IDR))
/**
* @brief Reads the output latch.
@ -342,7 +342,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_readlatch(port) ((port)->ODR)
#define pal_lld_readlatch(port) ((ioportmask_t)((port)->ODR))
/**
* @brief Writes on a I/O port.
@ -354,7 +354,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_writeport(port, bits) ((port)->ODR = (bits))
#define pal_lld_writeport(port, bits) ((port)->ODR = (uint32_t)(bits))
/**
* @brief Sets a bits mask on a I/O port.
@ -393,9 +393,11 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_writegroup(port, mask, offset, bits) \
((port)->BSRR.W = ((~(bits) & (mask)) << (16U + (offset))) | \
(((bits) & (mask)) << (offset)))
#define pal_lld_writegroup(port, mask, offset, bits) { \
uint32_t w = ((~(uint32_t)(bits) & (uint32_t)(mask)) << (16U + (offset))) | \
((uint32_t)(bits) & (uint32_t)(mask)) << (offset); \
(port)->BSRR.W = w; \
}
/**
* @brief Pads group mode setup.

14
os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.h
View File

@ -368,7 +368,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_readport(port) ((port)->IDR)
#define pal_lld_readport(port) ((ioportmask_t)((port)->IDR))
/**
* @brief Reads the output latch.
@ -382,7 +382,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_readlatch(port) ((port)->ODR)
#define pal_lld_readlatch(port) ((ioportmask_t)((port)->ODR))
/**
* @brief Writes on a I/O port.
@ -394,7 +394,7 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_writeport(port, bits) ((port)->ODR = (bits))
#define pal_lld_writeport(port, bits) ((port)->ODR = (uint32_t)(bits))
/**
* @brief Sets a bits mask on a I/O port.
@ -433,9 +433,11 @@ typedef uint32_t iopadid_t;
*
* @notapi
*/
#define pal_lld_writegroup(port, mask, offset, bits) \
((port)->BSRR.W = ((~(bits) & (mask)) << (16U + (offset))) | \
(((bits) & (mask)) << (offset)))
#define pal_lld_writegroup(port, mask, offset, bits) { \
uint32_t w = ((~(uint32_t)(bits) & (uint32_t)(mask)) << (16U + (offset))) | \
((uint32_t)(bits) & (uint32_t)(mask)) << (offset); \
(port)->BSRR.W = w; \
}
/**
* @brief Pads group mode setup.