Index: kernel/genarch/src/drivers/i8259/i8259.c
===================================================================
--- kernel/genarch/src/drivers/i8259/i8259.c	(revision 534bcdf6f87db58a9f44fa4244510aeed09d0c4e)
+++ kernel/genarch/src/drivers/i8259/i8259.c	(revision 46e886fb215db4c5bd1015c2bfd2c6d661dd93bd)
@@ -47,6 +47,5 @@
 static i8259_t *saved_pic1;
 
-void i8259_init(i8259_t *pic0, i8259_t *pic1, inr_t pic1_irq,
-    unsigned int irq0_vec)
+void i8259_init(i8259_t *pic0, i8259_t *pic1, unsigned int irq0_vec)
 {
 	saved_pic0 = pic0;
@@ -59,6 +58,6 @@
 	pio_write_8(&pic0->port2, irq0_vec);
 
-	/* ICW3: pic1 using IRQ IRQ_PIC1 */
-	pio_write_8(&pic0->port2, 1 << pic1_irq);
+	/* ICW3: pic1 using IRQ PIC0_IRQ_PIC1 */
+	pio_write_8(&pic0->port2, 1 << PIC0_IRQ_PIC1);
 
 	/* ICW4: i8086 mode */
@@ -69,8 +68,8 @@
 
 	/* ICW2: IRQ 8 maps to interrupt vector address irq0_vec + 8 */
-	pio_write_8(&pic1->port2, irq0_vec + PIC_IRQ_COUNT);
+	pio_write_8(&pic1->port2, irq0_vec + PIC0_IRQ_COUNT);
 
-	/* ICW3: pic1 is known as IRQ_PIC1 */
-	pio_write_8(&pic1->port2, pic1_irq);
+	/* ICW3: pic1 is known as PIC0_IRQ_PIC1 */
+	pio_write_8(&pic1->port2, PIC0_IRQ_PIC1);
 
 	/* ICW4: i8086 mode */
@@ -78,5 +77,5 @@
 
 	pic_disable_irqs(0xffff);		/* disable all irq's */
-	pic_enable_irqs(1 << pic1_irq);		/* but enable pic1_irq */
+	pic_enable_irqs(1 << PIC0_IRQ_PIC1);	/* but enable PIC0_IRQ_PIC1 */
 }
 
@@ -90,8 +89,8 @@
 		    (uint8_t) (x & (~(irqmask & 0xff))));
 	}
-	if (irqmask >> PIC_IRQ_COUNT) {
+	if (irqmask >> PIC0_IRQ_COUNT) {
 		x = pio_read_8(&saved_pic1->port2);
 		pio_write_8(&saved_pic1->port2,
-		    (uint8_t) (x & (~(irqmask >> PIC_IRQ_COUNT))));
+		    (uint8_t) (x & (~(irqmask >> PIC0_IRQ_COUNT))));
 	}
 }
@@ -106,8 +105,8 @@
 		    (uint8_t) (x | (irqmask & 0xff)));
 	}
-	if (irqmask >> PIC_IRQ_COUNT) {
+	if (irqmask >> PIC0_IRQ_COUNT) {
 		x = pio_read_8(&saved_pic1->port2);
 		pio_write_8(&saved_pic1->port2,
-		    (uint8_t) (x | (irqmask >> PIC_IRQ_COUNT)));
+		    (uint8_t) (x | (irqmask >> PIC0_IRQ_COUNT)));
 	}
 }
@@ -115,5 +114,5 @@
 void pic_eoi(unsigned int irq)
 {
-	if (irq >= PIC_IRQ_COUNT)
+	if (irq >= PIC0_IRQ_COUNT)
 		pio_write_8(&saved_pic1->port1, PIC_OCW4 | PIC_OCW4_NSEOI);
 	pio_write_8(&saved_pic0->port1, PIC_OCW4 | PIC_OCW4_NSEOI);
@@ -126,5 +125,5 @@
 	uint8_t isr_lo = pio_read_8(&saved_pic0->port1);
 	uint8_t isr_hi = pio_read_8(&saved_pic1->port1);
-	return !(((isr_hi << PIC_IRQ_COUNT) | isr_lo) & (1 << irq));
+	return !(((isr_hi << PIC0_IRQ_COUNT) | isr_lo) & (1 << irq));
 }
 
@@ -132,5 +131,5 @@
 {
 	/* For spurious IRQs from pic1, we need to isssue an EOI to pic0 */
-	if (irq >= PIC_IRQ_COUNT)
+	if (irq >= PIC0_IRQ_COUNT)
 		pio_write_8(&saved_pic0->port1, PIC_OCW4 | PIC_OCW4_NSEOI);
 }