Changeset 1affcdf3 in mainline for uspace/app/bdsh/cmds/modules/kcon/kcon.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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:

• uspace/app/bdsh/cmds/modules/kcon/kcon.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/kcon/kcon.c

@@ -32 +32 @@
 #include <stdlib.h>
 #include <io/console.h>
-#include <vfs/vfs.h>
 #include "config.h"
 #include "util.h"
@@ -42 +41 @@
 static const char *cmdname = "kcon";
 
-/* Dispays help for kcon in various levels */
+/* Display help for kcon in various levels */
 void help_cmd_kcon(unsigned int level)
 {
         printf("`kcon' switches to the kernel debug console.\n");
-
-        if (level != HELP_SHORT) {
-                printf("Usage:  %s\n", cmdname);
-        }
-
+        
+        if (level != HELP_SHORT)
+                printf("Usage: %s\n", cmdname);
+        
         return;
 }
@@ -57 +55 @@
 int cmd_kcon(char **argv)
 {
-        unsigned int argc;
-
-        argc = cli_count_args(argv);
-
+        unsigned int argc = cli_count_args(argv);
+        
         if (argc != 1) {
                 printf("%s - incorrect number of arguments. Try `%s --help'\n",
-                        cmdname, cmdname);
+                    cmdname, cmdname);
                 return CMD_FAILURE;
         }
-
-        console_kcon_enable(fphone(stdout));
-
-        return CMD_SUCCESS;
+        
+        if (console_kcon())
+                return CMD_SUCCESS;
+        else
+                return CMD_FAILURE;
 }
-