Merge pull request #308 from tlauda/topic/atomic-return-val

atomic: atomic_add and atomic_sub return value

Author: lgirdwood

src/arch/host/include/arch/atomic.h

@@ -56,14 +56,14 @@ static inline void arch_atomic_init(atomic_t *a, int32_t value)
 }
 
 /* use gcc atomic built-ins for host library */
-static inline void arch_atomic_add(atomic_t *a, int32_t value)
+static inline int32_t arch_atomic_add(atomic_t *a, int32_t value)
 {
-	__sync_fetch_and_add(&a->value, value);
+	return __sync_fetch_and_add(&a->value, value);
 }
 
-static inline void arch_atomic_sub(atomic_t *a, int32_t value)
+static inline int32_t arch_atomic_sub(atomic_t *a, int32_t value)
 {
-	__sync_fetch_and_sub(&a->value, value);
+	return __sync_fetch_and_sub(&a->value, value);
 }
 
 #endif

src/arch/xtensa/include/arch/atomic.h

@@ -54,7 +54,7 @@ static inline void arch_atomic_init(atomic_t *a, int32_t value)
 	arch_atomic_set(a, value);
 }
 
-static inline void arch_atomic_add(atomic_t *a, int32_t value)
+static inline int32_t arch_atomic_add(atomic_t *a, int32_t value)
 {
 	int32_t result, current;
 
@@ -67,9 +67,11 @@ static inline void arch_atomic_add(atomic_t *a, int32_t value)
 		: "=&a" (result), "=&a" (current)
 		: "a" (&a->value), "a" (value)
 		: "memory");
+
+	return (*(volatile int32_t *)&a->value);
 }
 
-static inline void arch_atomic_sub(atomic_t *a, int32_t value)
+static inline int32_t arch_atomic_sub(atomic_t *a, int32_t value)
 {
 	int32_t result, current;
 
@@ -82,6 +84,8 @@ static inline void arch_atomic_sub(atomic_t *a, int32_t value)
 		: "=&a" (result), "=&a" (current)
 		: "a" (&a->value), "a" (value)
 		: "memory");
+
+	return (*(volatile int32_t *)&a->value);
 }
 
 #endif

src/include/sof/atomic.h

@@ -50,14 +50,14 @@ static inline void atomic_set(atomic_t *a, int32_t value)
 	arch_atomic_set(a, value);
 }
 
-static inline void atomic_add(atomic_t *a, int32_t value)
+static inline int32_t atomic_add(atomic_t *a, int32_t value)
 {
-	arch_atomic_add(a, value);
+	return arch_atomic_add(a, value);
 }
 
-static inline void atomic_sub(atomic_t *a, int32_t value)
+static inline int32_t atomic_sub(atomic_t *a, int32_t value)
 {
-	arch_atomic_sub(a, value);
+	return arch_atomic_sub(a, value);
 }
 
 #endif