Skip to content

Revert "Update params in calls to LDREXW/STREXW to uint32_t" #9863

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2019
Merged

Revert "Update params in calls to LDREXW/STREXW to uint32_t" #9863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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));
}


static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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 )
Expand Down
8 changes: 4 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,19 +133,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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
static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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
Expand Down
8 changes: 4 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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));
}


static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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 */

Expand Down
8 changes: 4 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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));
}


static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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 )
Expand Down
8 changes: 4 additions & 4 deletions targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,19 +133,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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
static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
{
uint32_t newValue;
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 */
Expand Down