Changeset 8e7c9fe in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

kernel/generic/src/console/cmd.c

@@ -1149 +1149 @@
 int cmd_set4(cmd_arg_t *argv)
 {
-        uintptr_t addr;
+        uintptr_t addr = 0; // Prevent -Werror=maybe-uninitialized
         uint32_t arg1 = argv[1].intval;
         bool pointer = false;
@@ -1357 +1357 @@
         printf("The kernel will now relinquish the console.\n");
         release_console();
-        
-        event_notify_0(EVENT_KCONSOLE, false);
         indev_pop_character(stdin);