Changeset 15d0046 in mainline for kernel/generic/src/console/console.c

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

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

kernel/generic/src/console/console.c

@@ -204 +204 @@
 void grab_console(void)
 {
+        event_notify_1(EVENT_KCONSOLE, false, true);
         bool prev = console_override;
         
@@ -221 +222 @@
 {
         console_override = false;
+        event_notify_1(EVENT_KCONSOLE, false, false);
 }
 
 /** Activate kernel console override */
-sysarg_t sys_debug_activate_console(void)
+sysarg_t sys_debug_console(void)
 {
 #ifdef CONFIG_KCONSOLE