Index: kernel/genarch/include/drivers/i8042/i8042.h
===================================================================
--- kernel/genarch/include/drivers/i8042/i8042.h	(revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39)
+++ kernel/genarch/include/drivers/i8042/i8042.h	(revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2001-2004 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.
+ */
+
+/** @addtogroup genarch	
+ * @{
+ */
+/** @file
+ */
+
+#ifndef KERN_I8042_H_
+#define KERN_I8042_H_
+
+#include <ddi/irq.h>
+#include <arch/types.h>
+#include <console/chardev.h>
+#include <typedefs.h>
+
+struct i8042 {
+	ioport8_t data;
+	uint8_t pad[3];
+	ioport8_t status;
+} __attribute__ ((packed));
+typedef struct i8042 i8042_t;
+
+typedef struct i8042_instance {
+	devno_t devno;
+	irq_t irq;
+	i8042_t *i8042;
+	chardev_t *devout;
+} i8042_instance_t;
+
+extern bool i8042_init(i8042_t *, devno_t, inr_t, chardev_t *);
+
+#endif
+
+/** @}
+ */
Index: kernel/genarch/include/drivers/ns16550/ns16550.h
===================================================================
--- kernel/genarch/include/drivers/ns16550/ns16550.h	(revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39)
+++ kernel/genarch/include/drivers/ns16550/ns16550.h	(revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2001-2004 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.
+ */
+
+/** @addtogroup genarch	
+ * @{
+ */
+/**
+ * @file
+ * @brief	Headers for NS 16550 serial controller.
+ */
+
+#ifndef KERN_NS16550_H_
+#define KERN_NS16550_H_
+
+#include <ddi/irq.h>
+#include <arch/types.h>
+#include <console/chardev.h>
+
+#define IER_ERBFI	0x01	/** Enable Receive Buffer Full Interrupt. */
+
+#define LCR_DLAB	0x80	/** Divisor Latch Access bit. */
+
+#define MCR_OUT2	0x08	/** OUT2. */
+
+/** NS16550 registers. */
+struct ns16550 {
+	ioport8_t rbr;	/**< Receiver Buffer Register. */
+	ioport8_t ier;	/**< Interrupt Enable Register. */
+	union {
+		ioport8_t iir;	/**< Interrupt Ident Register (read). */
+		ioport8_t fcr;	/**< FIFO control register (write). */
+	} __attribute__ ((packed));
+	ioport8_t lcr;	/**< Line Control register. */
+	ioport8_t mcr;	/**< Modem Control Register. */
+	ioport8_t lsr;	/**< Line Status Register. */
+} __attribute__ ((packed));
+typedef struct ns16550 ns16550_t;
+
+/** Structure representing the ns16550 device. */
+typedef struct ns16550_instance {
+	devno_t devno;
+	ns16550_t *ns16550;
+	irq_t irq;
+	chardev_t *devout;
+} ns16550_instance_t;
+
+extern bool ns16550_init(ns16550_t *, devno_t, inr_t, cir_t, void *,
+    chardev_t *);
+extern irq_ownership_t ns16550_claim(irq_t *);
+extern void ns16550_irq_handler(irq_t *);
+
+#endif
+
+/** @}
+ */
Index: kernel/genarch/include/drivers/z8530/z8530.h
===================================================================
--- kernel/genarch/include/drivers/z8530/z8530.h	(revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39)
+++ kernel/genarch/include/drivers/z8530/z8530.h	(revision ec944b1fe3e29a4f91a93cbdd7acc7aa350d7f39)
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2009 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.
+ */
+
+/** @addtogroup genarch	
+ * @{
+ */
+/**
+ * @file
+ * @brief	Headers for Zilog 8530 serial controller.
+ */
+
+#ifndef KERN_Z8530_H_
+#define KERN_Z8530_H_
+
+#include <ddi/irq.h>
+#include <arch/types.h>
+#include <console/chardev.h>
+
+#define WR0	0
+#define WR1	1
+#define WR2	2
+#define WR3	3
+#define WR4	4
+#define WR5	5
+#define WR6	6
+#define WR7	7
+#define WR8	8
+#define WR9	9
+#define WR10	10
+#define WR11	11
+#define WR12	12
+#define WR13	13
+#define WR14	14
+#define WR15	15
+
+#define RR0	0
+#define RR1	1
+#define RR2	2
+#define RR3	3
+#define RR8	8
+#define RR10	10
+#define RR12	12
+#define RR13	13
+#define RR14	14
+#define RR15	15
+
+/** Reset pending TX interrupt. */
+#define WR0_TX_IP_RST	(0x5 << 3)
+#define WR0_ERR_RST	(0x6 << 3)
+
+/** Receive Interrupts Disabled. */
+#define WR1_RID		(0x0 << 3)
+/** Receive Interrupt on First Character or Special Condition. */
+#define WR1_RIFCSC	(0x1 << 3)
+/** Interrupt on All Receive Characters or Special Conditions. */
+#define WR1_IARCSC	(0x2 << 3)
+/** Receive Interrupt on Special Condition. */
+#define WR1_RISC	(0x3 << 3)
+/** Parity Is Special Condition. */
+#define WR1_PISC	(0x1 << 2)
+
+/** Rx Enable. */
+#define WR3_RX_ENABLE	(0x1 << 0)
+/** 8-bits per character. */
+#define WR3_RX8BITSCH	(0x3 << 6)
+
+/** Master Interrupt Enable. */
+#define WR9_MIE		(0x1 << 3)
+
+/** Receive Character Available. */
+#define RR0_RCA		(0x1 << 0)
+
+/** z8530's registers. */
+struct z8530 {
+	union {
+		ioport8_t ctl_b;
+		ioport8_t status_b;
+	} __attribute__ ((packed));
+	uint8_t pad1;
+	ioport8_t data_b;
+	uint8_t pad2;
+	union {
+		ioport8_t ctl_a;
+		ioport8_t status_a;
+	} __attribute__ ((packed));
+	uint8_t pad3;
+	ioport8_t data_a;
+} __attribute__ ((packed));
+typedef struct z8530 z8530_t;
+
+/** Structure representing the z8530 device. */
+typedef struct {
+	devno_t devno;
+	irq_t irq;
+	z8530_t *z8530;
+	chardev_t *devout;
+} z8530_instance_t;
+
+extern bool z8530_init(z8530_t *, devno_t, inr_t, cir_t, void *, chardev_t *);
+extern irq_ownership_t z8530_claim(irq_t *);
+extern void z8530_irq_handler(irq_t *);
+
+#endif
+
+/** @}
+ */
