Changeset 2b3dd78 in mainline for kernel/generic/src/lib

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• kernel/generic/src/lib/halt.c (moved) (moved from kernel/generic/src/lib/func.c ) (2 diffs)

kernel/generic/src/lib/halt.c

@@ -33 +33 @@
 /**
  * @file
- * @brief Miscellaneous functions.
+ * @brief Halt function.
  */
 
-#include <func.h>
+#include <halt.h>
 #include <log.h>
 #include <cpu.h>
@@ -43 +43 @@
 #include <console/kconsole.h>
 
-atomic_t haltstate = {0}; /**< Halt flag */
-
+/** Halt flag */
+atomic_t haltstate = {0};
 
 /** Halt wrapper