diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-10-16 08:31:39 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-10-16 08:31:39 +0000 |
commit | e9feb063f58caf1c625b80eb317f8727943a28e4 (patch) | |
tree | b2157364769c55b65760559e6a391d9e965abc48 /firmware/export/thread.h | |
parent | 19c280f327352ad4813235bc79c52eb4e52e6ec0 (diff) | |
download | rockbox-e9feb063f58caf1c625b80eb317f8727943a28e4.tar.gz 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
Diffstat (limited to 'firmware/export/thread.h')
-rw-r--r-- | firmware/export/thread.h | 6 |
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 | |||
339 | /* Macros generate better code than an inline function is this case */ | 339 | /* Macros generate better code than an inline function is this case */ |
340 | #if (defined (CPU_PP) || defined (CPU_ARM)) | 340 | #if (defined (CPU_PP) || defined (CPU_ARM)) |
341 | /* atomic */ | 341 | /* atomic */ |
342 | #ifdef SOFTWARE_CORELOCK | 342 | #if CONFIG_CORELOCK == SW_CORELOCK |
343 | #define test_and_set(a, v, cl) \ | 343 | #define test_and_set(a, v, cl) \ |
344 | xchg8((a), (v), (cl)) | 344 | xchg8((a), (v), (cl)) |
345 | /* atomic */ | 345 | /* atomic */ |
@@ -364,7 +364,7 @@ struct core_entry | |||
364 | *(a) = (v); \ | 364 | *(a) = (v); \ |
365 | corelock_unlock(cl); \ | 365 | corelock_unlock(cl); \ |
366 | o; }) | 366 | o; }) |
367 | #else | 367 | #elif CONFIG_CORELOCK == CORELOCK_SWAP |
368 | /* atomic */ | 368 | /* atomic */ |
369 | #define test_and_set(a, v, ...) \ | 369 | #define test_and_set(a, v, ...) \ |
370 | xchg8((a), (v)) | 370 | xchg8((a), (v)) |
@@ -393,7 +393,7 @@ struct core_entry | |||
393 | : "=r"(o) \ | 393 | : "=r"(o) \ |
394 | : "r"(v), "r"(a)); \ | 394 | : "r"(v), "r"(a)); \ |
395 | o; }) | 395 | o; }) |
396 | #endif /* SOFTWARE_CORELOCK */ | 396 | #endif /* locking selection */ |
397 | #elif defined (CPU_COLDFIRE) | 397 | #elif defined (CPU_COLDFIRE) |
398 | /* atomic */ | 398 | /* atomic */ |
399 | /* one branch will be optimized away if v is a constant expression */ | 399 | /* one branch will be optimized away if v is a constant expression */ |