Index: kernel/genarch/include/genarch/drivers/i8259/i8259.h
===================================================================
--- kernel/genarch/include/genarch/drivers/i8259/i8259.h	(revision 87a57963770ed25144cc5465eac8c036c70d4201)
+++ kernel/genarch/include/genarch/drivers/i8259/i8259.h	(revision d1cbad5d70ff4d3f6defcd8aa18099c29887260b)
@@ -39,9 +39,4 @@
 #include <arch/interrupt.h>
 
-#define PIC_PIC0PORT1  ((ioport8_t *) 0x20U)
-#define PIC_PIC0PORT2  ((ioport8_t *) 0x21U)
-#define PIC_PIC1PORT1  ((ioport8_t *) 0xa0U)
-#define PIC_PIC1PORT2  ((ioport8_t *) 0xa1U)
-
 /* ICW1 bits */
 #define PIC_ICW1           (1 << 4)
@@ -52,5 +47,10 @@
 #define PIC_OCW4_NSEOI     (1 << 5)
 
-extern void i8259_init(void);
+typedef struct {
+	ioport8_t port1;
+	ioport8_t port2;
+} __attribute__((packed)) i8259_t;
+
+extern void i8259_init(i8259_t *, i8259_t *);
 extern void pic_enable_irqs(uint16_t);
 extern void pic_disable_irqs(uint16_t);
Index: kernel/genarch/include/genarch/drivers/legacy/ia32/io.h
===================================================================
--- kernel/genarch/include/genarch/drivers/legacy/ia32/io.h	(revision 87a57963770ed25144cc5465eac8c036c70d4201)
+++ kernel/genarch/include/genarch/drivers/legacy/ia32/io.h	(revision d1cbad5d70ff4d3f6defcd8aa18099c29887260b)
@@ -44,4 +44,7 @@
 #define NS16550_BASE  ((ioport8_t *) 0x3f8)
 
+#define I8259_PIC0_BASE ((ioport8_t *) 0x20U)
+#define I8259_PIC1_BASE ((ioport8_t *) 0xA0U)
+
 #define EGA_VIDEORAM  0xb8000