Changeset a773b8b in mainline

Timestamp:

2019-03-30T16:20:53Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bbb99f82

Parents:

d1cbad5

Message:

Make i8259_init() more generic

Location:

kernel

Files:

• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• genarch/include/genarch/drivers/i8259/i8259.h (modified) (1 diff)
• genarch/src/drivers/i8259/i8259.c (modified) (5 diffs)

kernel/arch/amd64/src/amd64.c

@@ -121 +121 @@
                 /* PIC */
                 i8259_init((i8259_t *) I8259_PIC0_BASE,
-                    (i8259_t *) I8259_PIC1_BASE);
+                    (i8259_t *) I8259_PIC1_BASE, IRQ_PIC1, IVT_IRQBASE,
+                    IVT_IRQBASE + 8);
         }
 }

kernel/arch/ia32/src/ia32.c

@@ -110 +110 @@
                 /* PIC */
                 i8259_init((i8259_t *) I8259_PIC0_BASE,
-                    (i8259_t *) I8259_PIC1_BASE);
+                    (i8259_t *) I8259_PIC1_BASE, IRQ_PIC1, IVT_IRQBASE,
+                    IVT_IRQBASE + 8);
         }
 }

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

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

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

@@ -38 +38 @@
 
 #include <genarch/drivers/i8259/i8259.h>
-#include <cpu.h>
+#include <typedefs.h>
 #include <stdint.h>
-#include <arch/asm.h>
-#include <arch.h>
 #include <log.h>
 #include <interrupt.h>
@@ -51 +49 @@
 static i8259_t *saved_pic1;
 
-void i8259_init(i8259_t *pic0, i8259_t *pic1)
+void i8259_init(i8259_t *pic0, i8259_t *pic1, inr_t pic1_irq,
+    unsigned int irq0_int, unsigned int irq8_int)
 {
         saved_pic0 = pic0;
@@ -59 +58 @@
         pio_write_8(&pic0->port1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
-        /* ICW2: IRQ 0 maps to INT IRQBASE */
-        pio_write_8(&pic0->port2, IVT_IRQBASE);
+        /* ICW2: IRQ 0 maps to INT irq0_int */
+        pio_write_8(&pic0->port2, irq0_int);
 
         /* ICW3: pic1 using IRQ IRQ_PIC1 */
-        pio_write_8(&pic0->port2, 1 << IRQ_PIC1);
+        pio_write_8(&pic0->port2, 1 << pic1_irq);
 
         /* ICW4: i8086 mode */
@@ -71 +70 @@
         pio_write_8(&pic1->port1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
-        /* ICW2: IRQ 8 maps to INT (IVT_IRQBASE + 8) */
-        pio_write_8(&pic1->port2, IVT_IRQBASE + 8);
+        /* ICW2: IRQ 8 maps to INT irq8_int */
+        pio_write_8(&pic1->port2, irq8_int);
 
         /* ICW3: pic1 is known as IRQ_PIC1 */
-        pio_write_8(&pic1->port2, IRQ_PIC1);
+        pio_write_8(&pic1->port2, pic1_irq);
 
         /* ICW4: i8086 mode */
@@ -96 +95 @@
 
         pic_disable_irqs(0xffff);               /* disable all irq's */
-        pic_enable_irqs(1 << IRQ_PIC1);         /* but enable pic1 */
+        pic_enable_irqs(1 << pic1_irq);         /* but enable pic1_irq */
 }