Update params in calls to LD/STREXW to be uint32_t

bulislaw · bulislaw · commit 5f19cd9c94be · 2017-10-20T13:52:44.000-05:00
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/mxc/mxc_lock.h b/targets/TARGET_Maxim/TARGET_MAX32625/mxc/mxc_lock.h
@@ -69,7 +69,7 @@ __STATIC_INLINE int mxc_get_lock(uint32_t *lock, uint32_t value)
     do {
 
         // Return if the lock is taken by a different thread
-        if(__LDREXW((volatile unsigned long *)lock) != 0) {
+        if(__LDREXW((volatile uint32_t *)lock) != 0) {
             return E_BUSY;
         }
 
diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/mxc/mxc_lock.h b/targets/TARGET_Maxim/TARGET_MAX32630/mxc/mxc_lock.h
@@ -80,12 +80,12 @@ __STATIC_INLINE int mxc_get_lock(uint32_t *lock, uint32_t value)
     do {
 
         // Return if the lock is taken by a different thread
-        if(__LDREXW((volatile unsigned long *)lock) != 0) {
+        if(__LDREXW((volatile uint32_t *)lock) != 0) {
             return E_BUSY;
         }
 
         // Attempt to take the lock
-    } while(__STREXW(value, (volatile unsigned long *)lock) != 0);
+    } while(__STREXW(value, (volatile uint32_t *)lock) != 0);
 
     // Do not start any other memory access until memory barrier is complete
     __DMB();
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 unsigned long *)ptr) | mask;
+		newValue = (uint32_t)__LDREXW(ptr) | mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) 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 unsigned long *)ptr) &~mask;
+		newValue = (uint32_t)__LDREXW(ptr) &~mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) 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
@@ -129,19 +129,19 @@ static inline  void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
 {
 	uint32_t newValue;
 	do {
-		newValue = (uint32_t)__LDREXW((volatile unsigned long *)ptr) | mask;
+		newValue = (uint32_t)__LDREXW(ptr) | mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) 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 unsigned long *)ptr) &~mask;
+		newValue = (uint32_t)__LDREXW(ptr) &~mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) ptr));
+	} while (__STREXW(newValue, ptr));
 }
 
 #if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
diff --git a/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_def.h
@@ -129,19 +129,19 @@ static inline  void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
 {
 	uint32_t newValue;
 	do {
-		newValue = (uint32_t)__LDREXW((volatile unsigned long *)ptr) | mask;
+		newValue = (uint32_t)__LDREXW(ptr) | mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) 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 unsigned long *)ptr) &~mask;
+		newValue = (uint32_t)__LDREXW(ptr) &~mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) ptr));
+	} while (__STREXW(newValue, ptr));
 }
 
 #endif /* USE_RTOS */
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 unsigned long *)ptr) | mask;
+		newValue = (uint32_t)__LDREXW(ptr) | mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) 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 unsigned long *)ptr) &~mask;
+		newValue = (uint32_t)__LDREXW(ptr) &~mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) 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
@@ -132,19 +132,19 @@ static inline  void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)
 {
 	uint32_t newValue;
 	do {
-		newValue = (uint32_t)__LDREXW((volatile unsigned long *)ptr) | mask;
+		newValue = (uint32_t)__LDREXW(ptr) | mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) 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 unsigned long *)ptr) &~mask;
+		newValue = (uint32_t)__LDREXW(ptr) &~mask;
 
-	} while (__STREXW(newValue,(volatile unsigned long*) ptr));
+	} while (__STREXW(newValue, ptr));
 }
 
 #if  defined ( __GNUC__ ) && !defined ( __CC_ARM )

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ __STATIC_INLINE int mxc_get_lock(uint32_t *lock, uint32_t value)`
`69`	`69`	`do {`
`70`	`70`
`71`	`71`	`// Return if the lock is taken by a different thread`
`72`		`- if(__LDREXW((volatile unsigned long *)lock) != 0) {`
	`72`	`+ if(__LDREXW((volatile uint32_t *)lock) != 0) {`
`73`	`73`	`return E_BUSY;`
`74`	`74`	`}`
`75`	`75`
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 unsigned long *)ptr) \| mask;`
	`133`	`+ newValue = (uint32_t)__LDREXW(ptr) \| mask;`
`134`	`134`
`135`		`- } while (__STREXW(newValue,(volatile unsigned long*) 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 unsigned long *)ptr) &~mask;`
	`143`	`+ newValue = (uint32_t)__LDREXW(ptr) &~mask;`
`144`	`144`
`145`		`- } while (__STREXW(newValue,(volatile unsigned long*) 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
`@@ -129,19 +129,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)`
`129`	`129`	`{`
`130`	`130`	`uint32_t newValue;`
`131`	`131`	`do {`
`132`		`- newValue = (uint32_t)__LDREXW((volatile unsigned long *)ptr) \| mask;`
	`132`	`+ newValue = (uint32_t)__LDREXW(ptr) \| mask;`
`133`	`133`
`134`		`- } while (__STREXW(newValue,(volatile unsigned long*) ptr));`
	`134`	`+ } while (__STREXW(newValue, ptr));`
`135`	`135`	`}`
`136`	`136`
`137`	`137`
`138`	`138`	`static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`139`	`139`	`{`
`140`	`140`	`uint32_t newValue;`
`141`	`141`	`do {`
`142`		`- newValue = (uint32_t)__LDREXW((volatile unsigned long *)ptr) &~mask;`
	`142`	`+ newValue = (uint32_t)__LDREXW(ptr) &~mask;`
`143`	`143`
`144`		`- } while (__STREXW(newValue,(volatile unsigned long*) ptr));`
	`144`	`+ } while (__STREXW(newValue, ptr));`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`#if defined ( __GNUC__ ) && !defined ( __CC_ARM )`
Original file line number	Diff line number	Diff line change
`@@ -132,19 +132,19 @@ static inline void atomic_set_u32(volatile uint32_t *ptr, uint32_t mask)`
`132`	`132`	`{`
`133`	`133`	`uint32_t newValue;`
`134`	`134`	`do {`
`135`		`- newValue = (uint32_t)__LDREXW((volatile unsigned long *)ptr) \| mask;`
	`135`	`+ newValue = (uint32_t)__LDREXW(ptr) \| mask;`
`136`	`136`
`137`		`- } while (__STREXW(newValue,(volatile unsigned long*) ptr));`
	`137`	`+ } while (__STREXW(newValue, ptr));`
`138`	`138`	`}`
`139`	`139`
`140`	`140`
`141`	`141`	`static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`142`	`142`	`{`
`143`	`143`	`uint32_t newValue;`
`144`	`144`	`do {`
`145`		`- newValue = (uint32_t)__LDREXW((volatile unsigned long *)ptr) &~mask;`
	`145`	`+ newValue = (uint32_t)__LDREXW(ptr) &~mask;`
`146`	`146`
`147`		`- } while (__STREXW(newValue,(volatile unsigned long*) ptr));`
	`147`	`+ } while (__STREXW(newValue, ptr));`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`#if defined ( __GNUC__ ) && !defined ( __CC_ARM )`