Merge pull request #9863 from deepikabhavnani/old_commit_revert

Cruz Monrreal · web-flow · commit e64286be90be · 2019-02-26T13:33:53.000-06:00
Revert "Update params in calls to LDREXW/STREXW to uint32_t"
diff --git a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_def.h
@@ -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 )
diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_def.h
@@ -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
diff --git a/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_def.h
@@ -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 */
 
diff --git a/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_def.h
@@ -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 )
diff --git a/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_def.h
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -130,19 +130,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)`
`130`	`130`	`{`
`131`	`131`	`uint32_t newValue;`
`132`	`132`	`do {`
`133`		`- newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) \| mask;`
	`133`	`+ newValue = (uint32_t)__LDREXW(ptr) \| mask;`
`134`	`134`
`135`		`- } while (__STREXW(newValue,(volatile uint32_t *) ptr));`
	`135`	`+ } while (__STREXW(newValue, ptr));`
`136`	`136`	`}`
`137`	`137`
`138`	`138`
`139`	`139`	`static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`140`	`140`	`{`
`141`	`141`	`uint32_t newValue;`
`142`	`142`	`do {`
`143`		`- newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;`
	`143`	`+ newValue = (uint32_t)__LDREXW(ptr) &~mask;`
`144`	`144`
`145`		`- } while (__STREXW(newValue,(volatile uint32_t *) ptr));`
	`145`	`+ } while (__STREXW(newValue, ptr));`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`#if defined ( __GNUC__ ) && !defined ( __CC_ARM )`
Original file line number	Diff line number	Diff line change
`@@ -133,19 +133,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)`
`133`	`133`	`{`
`134`	`134`	`uint32_t newValue;`
`135`	`135`	`do {`
`136`		`- newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) \| mask;`
	`136`	`+ newValue = (uint32_t)__LDREXW(ptr) \| mask;`
`137`	`137`
`138`		`- } while (__STREXW(newValue,(volatile uint32_t *) ptr));`
	`138`	`+ } while (__STREXW(newValue, ptr));`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`// MBED patch`
`142`	`142`	`static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`143`	`143`	`{`
`144`	`144`	`uint32_t newValue;`
`145`	`145`	`do {`
`146`		`- newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;`
	`146`	`+ newValue = (uint32_t)__LDREXW(ptr) &~mask;`
`147`	`147`
`148`		`- } while (__STREXW(newValue,(volatile uint32_t *) ptr));`
	`148`	`+ } while (__STREXW(newValue, ptr));`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`// MBED patch`
Original file line number	Diff line number	Diff line change
`@@ -131,19 +131,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)`
`131`	`131`	`{`
`132`	`132`	`uint32_t newValue;`
`133`	`133`	`do {`
`134`		`- newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) \| mask;`
	`134`	`+ newValue = (uint32_t)__LDREXW(ptr) \| mask;`
`135`	`135`
`136`		`- } while (__STREXW(newValue,(volatile uint32_t *) ptr));`
	`136`	`+ } while (__STREXW(newValue, ptr));`
`137`	`137`	`}`
`138`	`138`
`139`	`139`
`140`	`140`	`static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`141`	`141`	`{`
`142`	`142`	`uint32_t newValue;`
`143`	`143`	`do {`
`144`		`- newValue = (uint32_t)__LDREXW((volatile uint32_t *)ptr) &~mask;`
	`144`	`+ newValue = (uint32_t)__LDREXW(ptr) &~mask;`
`145`	`145`
`146`		`- } while (__STREXW(newValue,(volatile uint32_t *) ptr));`
	`146`	`+ } while (__STREXW(newValue, ptr));`
`147`	`147`	`}`
`148`	`148`	`/* MBED */`
`149`	`149`