Changeset 534bcdf in mainline for kernel/genarch

Timestamp:

2019-04-06T09:02:46Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3daba42e

Parents:

fd67c9f

Message:

Always configure pic1 to start 8 IRQs after pic0

Location:

kernel/genarch

Files:

• include/genarch/drivers/i8259/i8259.h (modified) (1 diff)
• src/drivers/i8259/i8259.c (modified) (3 diffs)

kernel/genarch/include/genarch/drivers/i8259/i8259.h

@@ -60 +60 @@
 } __attribute__((packed)) i8259_t;
 
-extern void i8259_init(i8259_t *, i8259_t *, inr_t, unsigned int, unsigned int);
+extern void i8259_init(i8259_t *, i8259_t *, inr_t, unsigned int);
 extern void pic_enable_irqs(uint16_t);
 extern void pic_disable_irqs(uint16_t);

kernel/genarch/src/drivers/i8259/i8259.c

@@ -48 +48 @@
 
 void i8259_init(i8259_t *pic0, i8259_t *pic1, inr_t pic1_irq,
-    unsigned int irq0_int, unsigned int irq8_int)
+    unsigned int irq0_vec)
 {
         saved_pic0 = pic0;
@@ -56 +56 @@
         pio_write_8(&pic0->port1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
-        /* ICW2: IRQ 0 maps to INT irq0_int */
-        pio_write_8(&pic0->port2, irq0_int);
+        /* ICW2: IRQ 0 maps to interrupt vector address irq0_vec */
+        pio_write_8(&pic0->port2, irq0_vec);
 
         /* ICW3: pic1 using IRQ IRQ_PIC1 */
@@ -68 +68 @@
         pio_write_8(&pic1->port1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
-        /* ICW2: IRQ 8 maps to INT irq8_int */
-        pio_write_8(&pic1->port2, irq8_int);
+        /* ICW2: IRQ 8 maps to interrupt vector address irq0_vec + 8 */
+        pio_write_8(&pic1->port2, irq0_vec + PIC_IRQ_COUNT);
 
         /* ICW3: pic1 is known as IRQ_PIC1 */