Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Cortex-M CMSIS: Update CMSIS to version 4.3 #3128

Merged
merged 4 commits into from
Jun 1, 2015
Merged

Cortex-M CMSIS: Update CMSIS to version 4.3 #3128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bfed6c
cortexm: Update CMSIS to v4.3
May 31, 2015
9511027
cortexm: CMSIS: Replace tabs by spaces
May 18, 2015
1cfb11b
cortexm: CMSIS: Suppress cppcheck error about uninitialized result
May 18, 2015
fc92ec9
cortexm: CMSIS: Add extern "C" to CMSIS headers
Jan 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 81 additions & 52 deletions cpu/cortexm_common/include/core_cm0.h
View file
Open in desktop

Large diffs are not rendered by default.

144 changes: 88 additions & 56 deletions cpu/cortexm_common/include/core_cm0plus.h
View file
Open in desktop

Large diffs are not rendered by default.

265 changes: 154 additions & 111 deletions cpu/cortexm_common/include/core_cm3.h
View file
Open in desktop

Large diffs are not rendered by default.

274 changes: 165 additions & 109 deletions cpu/cortexm_common/include/core_cm4.h
View file
Open in desktop

Large diffs are not rendered by default.

2,397 changes: 2,397 additions & 0 deletions cpu/cortexm_common/include/core_cm7.h
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 31 additions & 4 deletions cpu/cortexm_common/include/core_cmFunc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**************************************************************************//**
* @file core_cmFunc.h
* @brief CMSIS Cortex-M Core Function Access Header File
* @version V4.00
* @date 28. August 2014
* @version V4.10
* @date 18. March 2015
*
* @note
*
******************************************************************************/
/* Copyright (c) 2009 - 2014 ARM LIMITED
/* Copyright (c) 2009 - 2015 ARM LIMITED

All rights reserved.
Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -245,6 +245,20 @@ __STATIC_INLINE void __set_BASEPRI(uint32_t basePri)
}


/** \brief Set Base Priority with condition

This function assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
or the new value increases the BASEPRI priority level.

\param [in] basePri Base Priority value to set
*/
__STATIC_INLINE void __set_BASEPRI_MAX(uint32_t basePri)
{
register uint32_t __regBasePriMax __ASM("basepri_max");
__regBasePriMax = (basePri & 0xff);
}


/** \brief Get Fault Mask

This function returns the current value of the Fault Mask register.
Expand Down Expand Up @@ -528,7 +542,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __get_BASEPRI(void)
{
uint32_t result;

__ASM volatile ("MRS %0, basepri_max" : "=r" (result) );
__ASM volatile ("MRS %0, basepri" : "=r" (result) );
return(result);
}

Expand All @@ -545,6 +559,19 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_BASEPRI(uint32_t v
}


/** \brief Set Base Priority with condition

This function assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
or the new value increases the BASEPRI priority level.

\param [in] basePri Base Priority value to set
*/
__attribute__( ( always_inline ) ) __STATIC_INLINE void __set_BASEPRI_MAX(uint32_t value)
{
__ASM volatile ("MSR basepri_max, %0" : : "r" (value) : "memory");
}


/** \brief Get Fault Mask

This function returns the current value of the Fault Mask register.
Expand Down
Loading