summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-10-16 08:31:39 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-10-16 08:31:39 +0000
commite9feb063f58caf1c625b80eb317f8727943a28e4 (patch)
treeb2157364769c55b65760559e6a391d9e965abc48
parent19c280f327352ad4813235bc79c52eb4e52e6ec0 (diff)
downloadrockbox-e9feb063f58caf1c625b80eb317f8727943a28e4.tar.gz
rockbox-e9feb063f58caf1c625b80eb317f8727943a28e4.tar.bz2
rockbox-e9feb063f58caf1c625b80eb317f8727943a28e4.zip
Oops made a mistake that messed up test_and_set selection.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15139 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/thread.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/export/thread.h b/firmware/export/thread.h
index 20cde1a8e3..89eb65184a 100644
--- a/firmware/export/thread.h
+++ b/firmware/export/thread.h
@@ -339,7 +339,7 @@ struct core_entry
/* Macros generate better code than an inline function is this case */
#if (defined (CPU_PP) || defined (CPU_ARM))
/* atomic */
-#ifdef SOFTWARE_CORELOCK
+#if CONFIG_CORELOCK == SW_CORELOCK
#define test_and_set(a, v, cl) \
xchg8((a), (v), (cl))
/* atomic */
@@ -364,7 +364,7 @@ struct core_entry
*(a) = (v); \
corelock_unlock(cl); \
o; })
-#else
+#elif CONFIG_CORELOCK == CORELOCK_SWAP
/* atomic */
#define test_and_set(a, v, ...) \
xchg8((a), (v))
@@ -393,7 +393,7 @@ struct core_entry
: "=r"(o) \
: "r"(v), "r"(a)); \
o; })
-#endif /* SOFTWARE_CORELOCK */
+#endif /* locking selection */
#elif defined (CPU_COLDFIRE)
/* atomic */
/* one branch will be optimized away if v is a constant expression */