mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #9863 from deepikabhavnani/old_commit_revert
Revert "Update params in calls to LDREXW/STREXW to uint32_t"pull/9808/head
commit
e64286be90
|
|
@ -130,9 +130,9 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) | mask;
|
newValue = (uint32_t)__LDREXW(ptr) | mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -140,9 +140,9 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;
|
newValue = (uint32_t)__LDREXW(ptr) &~mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined ( __GNUC__ ) && !defined ( __CC_ARM )
|
#if defined ( __GNUC__ ) && !defined ( __CC_ARM )
|
||||||
|
|
|
||||||
|
|
@ -133,9 +133,9 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) | mask;
|
newValue = (uint32_t)__LDREXW(ptr) | mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
// MBED patch
|
// MBED patch
|
||||||
|
|
@ -143,9 +143,9 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;
|
newValue = (uint32_t)__LDREXW(ptr) &~mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
// MBED patch
|
// MBED patch
|
||||||
|
|
|
||||||
|
|
@ -131,9 +131,9 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) | mask;
|
newValue = (uint32_t)__LDREXW(ptr) | mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -141,9 +141,9 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;
|
newValue = (uint32_t)__LDREXW(ptr) &~mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
/* MBED */
|
/* MBED */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -130,9 +130,9 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) | mask;
|
newValue = (uint32_t)__LDREXW(ptr) | mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -140,9 +140,9 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;
|
newValue = (uint32_t)__LDREXW(ptr) &~mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined ( __GNUC__ ) && !defined ( __CC_ARM )
|
#if defined ( __GNUC__ ) && !defined ( __CC_ARM )
|
||||||
|
|
|
||||||
|
|
@ -133,9 +133,9 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) | mask;
|
newValue = (uint32_t)__LDREXW(ptr) | mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Added for MBED PR #3062
|
// Added for MBED PR #3062
|
||||||
|
|
@ -143,9 +143,9 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
|
||||||
{
|
{
|
||||||
uint32_t newValue;
|
uint32_t newValue;
|
||||||
do {
|
do {
|
||||||
newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;
|
newValue = (uint32_t)__LDREXW(ptr) &~mask;
|
||||||
|
|
||||||
} while (__STREXW(newValue,(volatile uint32_t *) ptr));
|
} while (__STREXW(newValue, ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
|
#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue