Index: kernel/arch/ia32/src/drivers/ega.c
===================================================================
--- kernel/arch/ia32/src/drivers/ega.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/ia32/src/drivers/ega.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
@@ -0,0 +1,150 @@
+/*
+ * 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 ia32	
+ * @{
+ */
+/**
+ * @file
+ * @brief EGA driver.
+ */
+
+#include <arch/drivers/ega.h>
+#include <putchar.h>
+#include <mm/page.h>
+#include <mm/as.h>
+#include <arch/mm/page.h>
+#include <synch/spinlock.h>
+#include <arch/types.h>
+#include <arch/asm.h>
+#include <memstr.h>
+#include <console/chardev.h>
+#include <console/console.h>
+#include <sysinfo/sysinfo.h>
+
+/*
+ * The EGA driver.
+ * Simple and short. Function for displaying characters and "scrolling".
+ */
+
+SPINLOCK_INITIALIZE(egalock);
+static uint32_t ega_cursor;
+static uint8_t *videoram;
+
+static void ega_putchar(chardev_t *d, const char ch);
+
+chardev_t ega_console;
+static chardev_operations_t ega_ops = {
+	.write = ega_putchar
+};
+
+void ega_move_cursor(void);
+
+void ega_init(void)
+{
+	uint8_t hi, lo;
+	
+	videoram = (uint8_t *) hw_map(VIDEORAM, SCREEN * 2);
+	outb(0x3d4, 0xe);
+	hi = inb(0x3d5);
+	outb(0x3d4, 0xf);
+	lo = inb(0x3d5);
+	ega_cursor = (hi << 8) | lo;
+
+	chardev_initialize("ega_out", &ega_console, &ega_ops);
+	stdout = &ega_console;
+	
+	sysinfo_set_item_val("fb", NULL, true);
+	sysinfo_set_item_val("fb.kind", NULL, 2);
+	sysinfo_set_item_val("fb.width", NULL, ROW);
+	sysinfo_set_item_val("fb.height", NULL, ROWS);
+	sysinfo_set_item_val("fb.address.physical", NULL, VIDEORAM);
+	
+#ifndef CONFIG_FB
+	putchar('\n');
+#endif	
+}
+
+static void ega_display_char(char ch)
+{
+	videoram[ega_cursor * 2] = ch;
+}
+
+/*
+ * This function takes care of scrolling.
+ */
+static void ega_check_cursor(void)
+{
+	if (ega_cursor < SCREEN)
+		return;
+
+	memcpy((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
+	memsetw((uintptr_t) (videoram + (SCREEN - ROW) * 2), ROW, 0x0720);
+	ega_cursor = ega_cursor - ROW;
+}
+
+void ega_putchar(chardev_t *d, const char ch)
+{
+	ipl_t ipl;
+
+	ipl = interrupts_disable();
+	spinlock_lock(&egalock);
+
+	switch (ch) {
+		case '\n':
+			ega_cursor = (ega_cursor + ROW) - ega_cursor % ROW;
+			break;
+		case '\t':
+			ega_cursor = (ega_cursor + 8) - ega_cursor % 8;
+			break; 
+		case '\b':
+			if (ega_cursor % ROW)
+				ega_cursor--;
+			break;
+		default:
+			ega_display_char(ch);
+			ega_cursor++;
+			break;
+	}
+	ega_check_cursor();
+	ega_move_cursor();
+
+	spinlock_unlock(&egalock);
+	interrupts_restore(ipl);
+}
+
+void ega_move_cursor(void)
+{
+	outb(0x3d4, 0xe);
+	outb(0x3d5, (ega_cursor >> 8) & 0xff);
+	outb(0x3d4, 0xf);
+	outb(0x3d5, ega_cursor & 0xff);	
+}
+
+/** @}
+ */
Index: kernel/arch/ia32/src/drivers/i8254.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8254.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
@@ -0,0 +1,139 @@
+/*
+ * 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 ia32	
+ * @{
+ */
+/**
+ * @file
+ * @brief	i8254 chip driver.
+ *
+ * Low level time functions.
+ */
+
+#include <arch/types.h>
+#include <time/clock.h>
+#include <time/delay.h>
+#include <arch/interrupt.h>
+#include <arch/drivers/i8259.h>
+#include <arch/drivers/i8254.h>
+#include <cpu.h>
+#include <config.h>
+#include <arch/pm.h>
+#include <arch/asm.h>
+#include <arch/cpuid.h>
+#include <arch.h>
+#include <time/delay.h>
+#include <interrupt.h>
+
+#define CLK_PORT1	0x40
+#define CLK_PORT4	0x43
+
+#define CLK_CONST	1193180
+#define MAGIC_NUMBER	1194
+
+static void i8254_interrupt(int n, istate_t *istate);
+
+void i8254_init(void)
+{
+	i8254_normal_operation();
+}
+
+void i8254_normal_operation(void)
+{
+	outb(CLK_PORT4, 0x36);
+	pic_disable_irqs(1<<IRQ_CLK);
+	outb(CLK_PORT1, (CLK_CONST/HZ) & 0xf);
+	outb(CLK_PORT1, (CLK_CONST/HZ) >> 8);
+	pic_enable_irqs(1<<IRQ_CLK);
+	exc_register(VECTOR_CLK, "i8254_clock", (iroutine) i8254_interrupt);
+}
+
+#define LOOPS 150000
+#define SHIFT 11
+void i8254_calibrate_delay_loop(void)
+{
+	uint64_t clk1, clk2;
+	uint32_t t1, t2, o1, o2;
+	uint8_t not_ok;
+
+
+	/*
+	 * One-shot timer. Count-down from 0xffff at 1193180Hz
+	 * MAGIC_NUMBER is the magic value for 1ms.
+	 */
+	outb(CLK_PORT4, 0x30);
+	outb(CLK_PORT1, 0xff);
+	outb(CLK_PORT1, 0xff);
+
+	do {
+		/* will read both status and count */
+		outb(CLK_PORT4, 0xc2);
+		not_ok = (inb(CLK_PORT1)>>6)&1;
+		t1 = inb(CLK_PORT1);
+		t1 |= inb(CLK_PORT1) << 8;
+	} while (not_ok);
+
+	asm_delay_loop(LOOPS);
+
+	outb(CLK_PORT4, 0xd2);
+	t2 = inb(CLK_PORT1);
+	t2 |= inb(CLK_PORT1) << 8;
+
+	/*
+	 * We want to determine the overhead of the calibrating mechanism.
+	 */
+	outb(CLK_PORT4, 0xd2);
+	o1 = inb(CLK_PORT1);
+	o1 |= inb(CLK_PORT1) << 8;
+
+	asm_fake_loop(LOOPS);
+
+	outb(CLK_PORT4, 0xd2);
+	o2 = inb(CLK_PORT1);
+	o2 |= inb(CLK_PORT1) << 8;
+
+	CPU->delay_loop_const = ((MAGIC_NUMBER*LOOPS)/1000) / ((t1-t2)-(o1-o2)) + (((MAGIC_NUMBER*LOOPS)/1000) % ((t1-t2)-(o1-o2)) ? 1 : 0);
+
+	clk1 = rdtsc();
+	delay(1<<SHIFT);
+	clk2 = rdtsc();
+	
+	CPU->frequency_mhz = (clk2-clk1)>>SHIFT;
+
+	return;
+}
+
+void i8254_interrupt(int n, istate_t *istate)
+{
+	trap_virtual_eoi();
+	clock();
+}
+
+/** @}
+ */
Index: kernel/arch/ia32/src/drivers/i8259.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8259.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/ia32/src/drivers/i8259.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
@@ -0,0 +1,134 @@
+/*
+ * 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 ia32	
+ * @{
+ */
+/**
+ * @file
+ * @brief PIC driver.
+ *
+ * Programmable Interrupt Controller for UP systems based on i8259 chip.
+ */
+
+#include <arch/drivers/i8259.h>
+#include <cpu.h>
+#include <arch/types.h>
+#include <arch/asm.h>
+#include <arch.h>
+#include <print.h>
+#include <interrupt.h>
+
+static void pic_spurious(int n, istate_t *istate);
+
+void i8259_init(void)
+{
+	/* ICW1: this is ICW1, ICW4 to follow */
+	outb(PIC_PIC0PORT1, PIC_ICW1 | PIC_NEEDICW4);
+
+	/* ICW2: IRQ 0 maps to INT IRQBASE */
+	outb(PIC_PIC0PORT2, IVT_IRQBASE);
+
+	/* ICW3: pic1 using IRQ IRQ_PIC1 */
+	outb(PIC_PIC0PORT2, 1 << IRQ_PIC1);
+
+	/* ICW4: i8086 mode */
+	outb(PIC_PIC0PORT2, 1);
+
+	/* ICW1: ICW1, ICW4 to follow */
+	outb(PIC_PIC1PORT1, PIC_ICW1 | PIC_NEEDICW4);
+
+	/* ICW2: IRQ 8 maps to INT (IVT_IRQBASE + 8) */
+	outb(PIC_PIC1PORT2, IVT_IRQBASE + 8);
+
+	/* ICW3: pic1 is known as IRQ_PIC1 */
+	outb(PIC_PIC1PORT2, IRQ_PIC1);
+
+	/* ICW4: i8086 mode */
+	outb(PIC_PIC1PORT2, 1);
+
+	/*
+	 * Register interrupt handler for the PIC spurious interrupt.
+	 */
+	exc_register(VECTOR_PIC_SPUR, "pic_spurious", (iroutine) pic_spurious);	
+
+	/*
+	 * Set the enable/disable IRQs handlers.
+	 * Set the End-of-Interrupt handler.
+	 */
+	enable_irqs_function = pic_enable_irqs;
+	disable_irqs_function = pic_disable_irqs;
+	eoi_function = pic_eoi;
+
+	pic_disable_irqs(0xffff);		/* disable all irq's */
+	pic_enable_irqs(1<<IRQ_PIC1);		/* but enable pic1 */
+}
+
+void pic_enable_irqs(uint16_t irqmask)
+{
+	uint8_t x;
+
+	if (irqmask & 0xff) {
+		x = inb(PIC_PIC0PORT2);
+		outb(PIC_PIC0PORT2, x & (~(irqmask & 0xff)));
+	}
+	if (irqmask >> 8) {
+		x = inb(PIC_PIC1PORT2);
+		outb(PIC_PIC1PORT2, x & (~(irqmask >> 8)));
+	}
+}
+
+void pic_disable_irqs(uint16_t irqmask)
+{
+	uint8_t x;
+
+	if (irqmask & 0xff) {
+		x = inb(PIC_PIC0PORT2);
+		outb(PIC_PIC0PORT2, x | (irqmask & 0xff));
+	}
+	if (irqmask >> 8) {
+		x = inb(PIC_PIC1PORT2);
+		outb(PIC_PIC1PORT2, x | (irqmask >> 8));
+	}
+}
+
+void pic_eoi(void)
+{
+	outb(0x20,0x20);
+	outb(0xa0,0x20);
+}
+
+void pic_spurious(int n, istate_t *istate)
+{
+#ifdef CONFIG_DEBUG
+	printf("cpu%d: PIC spurious interrupt\n", CPU->id);
+#endif
+}
+
+/** @}
+ */
Index: kernel/arch/ia32/src/drivers/vesa.c
===================================================================
--- kernel/arch/ia32/src/drivers/vesa.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/ia32/src/drivers/vesa.c	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2006 Jakub Vana
+ * 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 ia32	
+ * @{
+ */
+/**
+ * @file
+ * @brief VESA frame buffer driver.
+ */
+
+#ifdef CONFIG_FB
+
+#include <genarch/fb/fb.h>
+#include <arch/drivers/vesa.h>
+#include <putchar.h>
+#include <mm/page.h>
+#include <mm/frame.h>
+#include <mm/as.h>
+#include <arch/mm/page.h>
+#include <synch/spinlock.h>
+#include <arch/asm.h>
+#include <arch/types.h>
+#include <typedefs.h>
+#include <memstr.h>
+#include <bitops.h>
+
+uint32_t vesa_ph_addr;
+uint16_t vesa_width;
+uint16_t vesa_height;
+uint16_t vesa_bpp;
+uint16_t vesa_scanline;
+
+int vesa_present(void)
+{
+	if (vesa_width != 0xffff)
+		return true;
+	if (vesa_height != 0xffff)
+		return true;
+	return false;
+}
+
+void vesa_init(void)
+{
+	fb_init(vesa_ph_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline);
+}
+
+#endif
+
+/** @}
+ */