Index: uspace/app/bdsh/cmds/modules/kcon/entry.h
===================================================================
--- uspace/app/bdsh/cmds/modules/kcon/entry.h	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
+++ uspace/app/bdsh/cmds/modules/kcon/entry.h	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
@@ -0,0 +1,9 @@
+#ifndef KCON_ENTRY_H
+#define KCON_ENTRY_H
+
+/* Entry points for the kcon command */
+extern int cmd_kcon(char **);
+extern void help_cmd_kcon(unsigned int);
+
+#endif /* KCON_ENTRY_H */
+
Index: uspace/app/bdsh/cmds/modules/kcon/kcon.c
===================================================================
--- uspace/app/bdsh/cmds/modules/kcon/kcon.c	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
+++ uspace/app/bdsh/cmds/modules/kcon/kcon.c	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
@@ -0,0 +1,72 @@
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <console.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "kcon.h"
+#include "cmds.h"
+
+static char *cmdname = "kcon";
+
+/* Dispays 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);
+	}
+
+	return;
+}
+
+/* Main entry point for kcon, accepts an array of arguments */
+int cmd_kcon(char **argv)
+{
+	unsigned int argc;
+
+	argc = cli_count_args(argv);
+
+	if (argc != 1) {
+		printf("%s - incorrect number of arguments. Try `%s --help'\n",
+			cmdname, cmdname);
+		return CMD_FAILURE;
+	}
+
+	console_kcon_enable();
+
+	return CMD_SUCCESS;
+}
+
Index: uspace/app/bdsh/cmds/modules/kcon/kcon.h
===================================================================
--- uspace/app/bdsh/cmds/modules/kcon/kcon.h	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
+++ uspace/app/bdsh/cmds/modules/kcon/kcon.h	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
@@ -0,0 +1,8 @@
+#ifndef KCON_H
+#define KCON_H
+
+/* Prototypes for the kcon command, excluding entry points */
+
+
+#endif /* KCON_H */
+
Index: uspace/app/bdsh/cmds/modules/kcon/kcon_def.h
===================================================================
--- uspace/app/bdsh/cmds/modules/kcon/kcon_def.h	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
+++ uspace/app/bdsh/cmds/modules/kcon/kcon_def.h	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
@@ -0,0 +1,7 @@
+{
+	"kcon",
+	"Switch to kernel console",
+	&cmd_kcon,
+	&help_cmd_kcon,
+},
+
Index: uspace/app/bdsh/cmds/modules/modules.h
===================================================================
--- uspace/app/bdsh/cmds/modules/modules.h	(revision 9646159109db804ee73ff4a9fc8359fb3318c3d2)
+++ uspace/app/bdsh/cmds/modules/modules.h	(revision c3ebc47808497be5b06d4cc84b2406a50fbbc76f)
@@ -27,4 +27,5 @@
 #include "sleep/entry.h"
 #include "cp/entry.h"
+#include "kcon/entry.h"
 
 /* Each .def function fills the module_t struct with the individual name, entry
@@ -42,4 +43,5 @@
 #include "sleep/sleep_def.h"
 #include "cp/cp_def.h"
+#include "kcon/kcon_def.h"
 	{NULL, NULL, NULL, NULL}
 };