Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
portapack-mayhem
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mcules
portapack-mayhem
Commits
17e5f6a1
Commit
17e5f6a1
authored
6 years ago
by
Jared Boone
Browse files
Options
Downloads
Patches
Plain Diff
ChibiOS/CMSIS: Patch to address C++1z warnings about "register" keyword.
parent
01bad280
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
firmware/chibios/os/ports/common/ARMCMx/CMSIS/include/core_cmFunc.h
+12
-9
12 additions, 9 deletions
...hibios/os/ports/common/ARMCMx/CMSIS/include/core_cmFunc.h
with
12 additions
and
9 deletions
firmware/chibios/os/ports/common/ARMCMx/CMSIS/include/core_cmFunc.h
+
12
−
9
View file @
17e5f6a1
...
...
@@ -307,6 +307,10 @@ __STATIC_INLINE void __set_FPSCR(uint32_t fpscr)
#elif defined ( __GNUC__ )
/*------------------ GNU Compiler ---------------------*/
/* GNU gcc specific functions */
#ifndef __STATIC_FORCEINLINE
#define __STATIC_FORCEINLINE __attribute__((always_inline)) static inline
#endif
/** \brief Enable IRQ Interrupts
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
This function r
eturns the current value of the Process Stack Pointer (PSP).
\details R
eturns the current value of the Process Stack Pointer (PSP).
\return PSP Register value
*/
__attribute__
(
(
always_inline
)
)
__STATIC_INLINE
uint32_t
__get_PSP
(
void
)
__STATIC_
FORCE
INLINE
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
);
}
...
...
@@ -430,19 +434,18 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_PSP(uint32_t topOf
/** \brief Get Main Stack Pointer
This function r
eturns the current value of the Main Stack Pointer (MSP).
\details R
eturns the current value of the Main Stack Pointer (MSP).
\return MSP Register value
*/
__attribute__
(
(
always_inline
)
)
__STATIC_INLINE
uint32_t
__get_MSP
(
void
)
__STATIC_
FORCE
INLINE
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
);
}
/** \brief Set Main Stack Pointer
This function assigns the given value to the Main Stack Pointer (MSP).
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment