Index: kernel/arch/ia32/include/drivers/ega.h
===================================================================
--- kernel/arch/ia32/include/drivers/ega.h	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/arch/ia32/include/drivers/ega.h	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -37,5 +37,5 @@
 
 #define EGA_VIDEORAM 	0xb8000
-#define EGA_BASE	0x3d4
+#define EGA_BASE	((ioport8_t *)0x3d4)
 
 #endif
Index: kernel/arch/ia32/include/drivers/i8259.h
===================================================================
--- kernel/arch/ia32/include/drivers/i8259.h	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/arch/ia32/include/drivers/i8259.h	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -39,8 +39,8 @@
 #include <arch/interrupt.h>
 
-#define PIC_PIC0PORT1	0x20
-#define PIC_PIC0PORT2	0x21
-#define PIC_PIC1PORT1	0xa0
-#define PIC_PIC1PORT2	0xa1
+#define PIC_PIC0PORT1	((ioport8_t *) 0x20)
+#define PIC_PIC0PORT2	((ioport8_t *) 0x21)
+#define PIC_PIC1PORT1	((ioport8_t *) 0xa0)
+#define PIC_PIC1PORT2	((ioport8_t *) 0xa1)
 
 #define PIC_NEEDICW4	(1<<0)
Index: kernel/arch/ia32/src/drivers/i8254.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8254.c	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -54,6 +54,6 @@
 #include <ddi/device.h>
 
-#define CLK_PORT1	0x40
-#define CLK_PORT4	0x43
+#define CLK_PORT1	((ioport8_t *)0x40)
+#define CLK_PORT4	((ioport8_t *)0x43)
 
 #define CLK_CONST	1193180
Index: kernel/arch/ia32/src/drivers/i8259.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8259.c	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/arch/ia32/src/drivers/i8259.c	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -120,6 +120,6 @@
 void pic_eoi(void)
 {
-	pio_write_8(0x20, 0x20);
-	pio_write_8(0xa0, 0x20);
+	pio_write_8((ioport8_t *)0x20, 0x20);
+	pio_write_8((ioport8_t *)0xa0, 0x20);
 }
 
Index: kernel/arch/ia32/src/smp/smp.c
===================================================================
--- kernel/arch/ia32/src/smp/smp.c	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/arch/ia32/src/smp/smp.c	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -123,6 +123,6 @@
 	 * BIOS will not do the POST after the INIT signal.
 	 */
-	pio_write_8(0x70, 0xf);
-	pio_write_8(0x71, 0xa);
+	pio_write_8((ioport8_t *)0x70, 0xf);
+	pio_write_8((ioport8_t *)0x71, 0xa);
 
 	pic_disable_irqs(0xffff);
Index: kernel/arch/ia64/include/drivers/ega.h
===================================================================
--- kernel/arch/ia64/include/drivers/ega.h	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/arch/ia64/include/drivers/ega.h	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -37,5 +37,5 @@
 
 #define EGA_VIDEORAM 	0xb8000
-#define EGA_BASE	0x3d4
+#define EGA_BASE	((ioport8_t *)0x3d4)
 
 #endif
Index: kernel/genarch/include/drivers/ega/ega.h
===================================================================
--- kernel/genarch/include/drivers/ega/ega.h	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/genarch/include/drivers/ega/ega.h	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -47,5 +47,5 @@
 
 extern void ega_redraw(void);
-extern void ega_init(ioport_t, uintptr_t);
+extern void ega_init(ioport8_t *, uintptr_t);
 
 #endif
Index: kernel/genarch/src/drivers/ega/ega.c
===================================================================
--- kernel/genarch/src/drivers/ega/ega.c	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/genarch/src/drivers/ega/ega.c	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -59,5 +59,5 @@
 static uint8_t *videoram;
 static uint8_t *backbuf;
-static ioport_t ega_base;
+static ioport8_t *ega_base;
 
 chardev_t ega_console;
@@ -132,5 +132,5 @@
 };
 
-void ega_init(ioport_t base, uintptr_t videoram_phys)
+void ega_init(ioport8_t *base, uintptr_t videoram_phys)
 {
 	/* Initialize the software structure. */	
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision 7d60cf59c22009459162657970aeff4fb02727ed)
+++ kernel/generic/src/ipc/irq.c	(revision 5cb223fc45a97511d5661289ec56529d021ec8f6)
@@ -102,8 +102,8 @@
 			break;
 		case CMD_PORT_READ_1:
-			dstval = pio_read_8((long) code->cmds[i].addr);
+			dstval = pio_read_8((ioport8_t *) code->cmds[i].addr);
 			break;
 		case CMD_PORT_WRITE_1:
-			pio_write_8((long) code->cmds[i].addr, code->cmds[i].value);
+			pio_write_8((ioport8_t *) code->cmds[i].addr, code->cmds[i].value);
 			break;
 		default:
