Index: generic/include/console/chardev.h
===================================================================
--- generic/include/console/chardev.h	(revision ef0e2598ce81b621e2ab24cc22dec0ca61e29182)
+++ generic/include/console/chardev.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -37,8 +37,12 @@
 #define CHARDEV_BUFLEN 512
 
+struct chardev;
+
 /* Character device operations interface. */
 struct chardev_operations {
-	void (* suspend)(void);		/**< Suspend pushing characters. */
-	void (* resume)(void);		/**< Resume pushing characters. */
+	void (* suspend)(struct chardev *);/**< Suspend pushing characters. */
+	void (* resume)(struct chardev *); /**< Resume pushing characters. */
+	/** Write character to stream */
+	void (* write)(struct chardev *, char c);
 };
 
@@ -47,13 +51,18 @@
 /** Character input device. */
 struct chardev {
+	char *name;
+	
 	waitq_t wq;
 	spinlock_t lock;		/**< Protects everything below. */
 	__u8 buffer[CHARDEV_BUFLEN];
 	count_t counter;
+	chardev_operations_t *op;	/**< Implementation of chardev operations. */
 	index_t index;
-	chardev_operations_t *op;	/**< Implementation of chardev operations. */
+	void *data;
 };
 
-extern void chardev_initialize(chardev_t *chardev, chardev_operations_t *op);
+extern void chardev_initialize(char *name,
+			       chardev_t *chardev, 
+			       chardev_operations_t *op);
 void chardev_push_character(chardev_t *chardev, __u8 ch);
 
Index: generic/include/console/console.h
===================================================================
--- generic/include/console/console.h	(revision ef0e2598ce81b621e2ab24cc22dec0ca61e29182)
+++ generic/include/console/console.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -34,7 +34,9 @@
 
 extern chardev_t *stdin;
+extern chardev_t *stdout;
 
 extern __u8 getc(chardev_t *chardev);
 extern count_t gets(chardev_t *chardev, char *buf, size_t buflen);
+extern void putchar(char c);
 
 #endif /* __CHARDEV_H__ */
Index: generic/include/interrupt.h
===================================================================
--- generic/include/interrupt.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
+++ generic/include/interrupt.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2005 Ondrej Palkovsky
+ * 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 __INTERRUPT_H__
+#define __INTERRUPT_H__
+
+#include <arch/interrupt.h>
+
+#ifndef IVT_ITEMS
+#  define IVT_ITEMS 1
+#endif
+
+typedef void (* iroutine)(int n, void *stack);
+
+extern iroutine exc_register(int n, char *name, iroutine f);
+extern void exc_dispatch(int n, void *stack);
+
+#endif
Index: generic/include/print.h
===================================================================
--- generic/include/print.h	(revision ef0e2598ce81b621e2ab24cc22dec0ca61e29182)
+++ generic/include/print.h	(revision 6095342f82cb691572e06dbe4aef66ee04a8d94a)
@@ -37,5 +37,4 @@
 #define INT64	8
 
-extern void putchar(const char c);
 extern void printf(const char *fmt, ...);