Changeset fc10e1b in mainline for kernel/generic/src/lib/halt.c

Timestamp:

2018-09-07T16:34:11Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d2c91ab

Parents:

508b0df1 (diff), e90cfa6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'atomic'

Use more of <stdatomic.h> in kernel. Increment/decrement macros kept because
the are handy. atomic_t currently kept because I'm way too lazy to go through
all uses and think about the most appropriate replacement.

File:

• kernel/generic/src/lib/halt.c (modified) (2 diffs)

kernel/generic/src/lib/halt.c

@@ -44 +44 @@
 
 /** Halt flag */
-atomic_t haltstate = { 0 };
+atomic_t haltstate = 0;
 
 /** Halt wrapper
@@ -56 +56 @@
         bool rundebugger = false;
 
-        if (!atomic_get(&haltstate)) {
-                atomic_set(&haltstate, 1);
+        if (!atomic_load(&haltstate)) {
+                atomic_store(&haltstate, 1);
                 rundebugger = true;
         }
 #else
-        atomic_set(&haltstate, 1);
+        atomic_store(&haltstate, 1);
 #endif