Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-05 21:24:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

ChibiOS/CMSIS: Patch to address C++1z warnings about "register" keyword.

Browse source
This commit is contained in:
Jared Boone 2018-08-05 15:00:45 -07:00
parent 01bad2805c
commit 17e5f6a1d7
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
firmware/chibios/os/ports/common/ARMCMx/CMSIS/include/core_cmFunc.h
View file

@ -307,6 +307,10 @@ __STATIC_INLINE void __set_FPSCR(uint32_t fpscr)
#elif defined ( __GNUC__ ) /*------------------ GNU Compiler ---------------------*/ #elif defined ( __GNUC__ ) /*------------------ GNU Compiler ---------------------*/
/* GNU gcc specific functions */ /* GNU gcc specific functions */
#ifndef __STATIC_FORCEINLINE
#define __STATIC_FORCEINLINE __attribute__((always_inline)) static inline
#endif
/** \brief Enable IRQ Interrupts /** \brief Enable IRQ Interrupts
This function enables IRQ interrupts by clearing the I-bit in the CPSR. This function enables IRQ interrupts by clearing the I-bit in the CPSR.
@ -403,15 +407,15 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_xPSR(void)
/** \brief Get Process Stack Pointer /** \brief Get Process Stack Pointer
This function returns the current value of the Process Stack Pointer (PSP). \details Returns the current value of the Process Stack Pointer (PSP).
\return PSP Register value \return PSP Register value
*/ */
__attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_PSP(void) __STATIC_FORCEINLINE uint32_t __get_PSP(void)
{ {
register uint32_t result; uint32_t result;
__ASM volatile ("MRS %0, psp\n" : "=r" (result) ); __ASM volatile ("MRS %0, psp" : "=r" (result) );
return(result); return(result);
} }
@ -430,19 +434,18 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_PSP(uint32_t topOf
/** \brief Get Main Stack Pointer /** \brief Get Main Stack Pointer
This function returns the current value of the Main Stack Pointer (MSP). \details Returns the current value of the Main Stack Pointer (MSP).
\return MSP Register value \return MSP Register value
*/ */
__attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_MSP(void) __STATIC_FORCEINLINE uint32_t __get_MSP(void)
{ {
register uint32_t result; uint32_t result;
__ASM volatile ("MRS %0, msp\n" : "=r" (result) ); __ASM volatile ("MRS %0, msp" : "=r" (result) );
return(result); return(result);
} }
/** \brief Set Main Stack Pointer /** \brief Set Main Stack Pointer
This function assigns the given value to the Main Stack Pointer (MSP). This function assigns the given value to the Main Stack Pointer (MSP).