Index: generic/include/console/console.h
===================================================================
--- generic/include/console/console.h	(revision 607c5f9ed835a2f0301c7d609f3e38c0d5e4dc77)
+++ generic/include/console/console.h	(revision ff3b319747ef6a37e65c572ab02d43341c925c0c)
@@ -36,5 +36,5 @@
 
 extern __u8 getc(chardev_t *chardev);
-extern void gets(chardev_t *chardev, __u8 *buf, size_t buflen);
+extern count_t gets(chardev_t *chardev, char *buf, size_t buflen);
 
 #endif /* __CHARDEV_H__ */
Index: generic/include/func.h
===================================================================
--- generic/include/func.h	(revision 607c5f9ed835a2f0301c7d609f3e38c0d5e4dc77)
+++ generic/include/func.h	(revision ff3b319747ef6a37e65c572ab02d43341c925c0c)
@@ -31,4 +31,5 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 extern __u32 haltstate;
@@ -36,5 +37,6 @@
 extern void halt(void);
 
-extern int strcmp(const char *src, const char *dst);
+extern size_t strlen(const char *str);
+extern int strcmp(const char *src, const char *dst, size_t len);
 
 #endif
Index: generic/include/macros.h
===================================================================
--- generic/include/macros.h	(revision ff3b319747ef6a37e65c572ab02d43341c925c0c)
+++ generic/include/macros.h	(revision ff3b319747ef6a37e65c572ab02d43341c925c0c)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005 Jakub Jermar
+ * 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#ifndef __MACROS_H__
+#define __MACROS_H__
+
+#define is_digit(d)	(((d) >= '0') && ((d)<='9'))
+#define is_lower(c)	(((c) >= 'a') && ((c) <= 'z'))
+#define is_upper(c)	(((c) >= 'A') && ((c) <= 'Z'))
+#define is_alpha(c)	(is_lower(c) || is_upper(c))
+#define is_alphanum(c)	(is_alpha(c) || is_digit(c))
+#define is_white(c)	(((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r'))
+
+#endif
Index: generic/include/main/kconsole.h
===================================================================
--- generic/include/main/kconsole.h	(revision 607c5f9ed835a2f0301c7d609f3e38c0d5e4dc77)
+++ generic/include/main/kconsole.h	(revision ff3b319747ef6a37e65c572ab02d43341c925c0c)
@@ -30,5 +30,39 @@
 #define __KCONSOLE_H__
 
+#include <typedefs.h>
+#include <list.h>
+#include <synch/spinlock.h>
+
+enum cmd_arg_type {
+	ARG_TYPE_INVALID = 0,
+	ARG_TYPE_INT,
+	ARG_TYPE_STRING
+};
+
+/** Structure representing one argument of kconsole command line. */
+struct cmd_arg {
+	cmd_arg_type_t type;		/**< Type descriptor. */
+	void *buffer;			/**< Buffer where to store data. */
+	size_t buflen;			/**< Size of the buffer. */
+};
+
+/** Structure representing one kconsole command. */
+struct cmd_info {
+	link_t link;			/**< Command list link. */
+	spinlock_t lock;		/**< This lock protects everything below. */
+	const char *name;		/**< Command name. */
+	const char *description;	/**< Textual description. */
+	int (* func)(cmd_arg_t *cmd);	/**< Function implementing the command. */
+	count_t argc;			/**< Number of arguments. */
+	cmd_arg_t *argv;		/**< Argument vector. */
+};
+
+extern spinlock_t cmd_lock;
+extern link_t cmd_head;
+
+extern void kconsole_init(void);
 extern void kconsole(void *arg);
 
+extern int cmd_register(cmd_info_t *cmd);
+
 #endif
Index: generic/include/typedefs.h
===================================================================
--- generic/include/typedefs.h	(revision 607c5f9ed835a2f0301c7d609f3e38c0d5e4dc77)
+++ generic/include/typedefs.h	(revision ff3b319747ef6a37e65c572ab02d43341c925c0c)
@@ -82,3 +82,7 @@
 typedef struct chardev chardev_t;
 
+typedef enum cmd_arg_type cmd_arg_type_t;
+typedef struct cmd_arg cmd_arg_t;
+typedef struct cmd_info cmd_info_t;
+
 #endif