Changeset 2a103b5 in mainline for kernel/genarch/src/drivers/i8259/i8259.c

Timestamp:

2019-06-09T11:31:38Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c48de91

Parents:

b401b33

Message:

Introduce PIC operations indirection mechanism

Some architectures switch from one interrupt controller implementation
to another during runtime. By providing a cleaner indirection mechanism,
it is possible e.g. for the ia32 IRQ 7 handler to distinguish i8259
spurious interrupts from actual IRQ 7 device interrupts, even when the
i8259 interrupt controller is no longer active.

File:

• kernel/genarch/src/drivers/i8259/i8259.c (modified) (6 diffs)

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

@@ -43 +43 @@
 #include <interrupt.h>
 
+static const char *i8259_get_name(void);
+
+pic_ops_t i8259_pic_ops = {
+        .get_name = i8259_get_name,
+        .enable_irqs = i8259_enable_irqs,
+        .disable_irqs = i8259_disable_irqs,
+        .eoi = i8259_eoi,
+        .is_spurious = i8259_is_spurious,
+        .handle_spurious = i8259_handle_spurious
+};
+
 // XXX: need to change pic_* API to get rid of these
 static i8259_t *saved_pic0;
@@ -76 +87 @@
         pio_write_8(&pic1->port2, 1);
 
-        pic_disable_irqs(0xffff);               /* disable all irq's */
-        pic_enable_irqs(1 << PIC0_IRQ_PIC1);    /* but enable PIC0_IRQ_PIC1 */
+        i8259_disable_irqs(0xffff);             /* disable all irq's */
+        i8259_enable_irqs(1 << PIC0_IRQ_PIC1);  /* but enable PIC0_IRQ_PIC1 */
 }
 
-void pic_enable_irqs(uint16_t irqmask)
+const char *i8259_get_name(void)
+{
+        return "i8259";
+}
+
+void i8259_enable_irqs(uint16_t irqmask)
 {
         uint8_t x;
@@ -96 +112 @@
 }
 
-void pic_disable_irqs(uint16_t irqmask)
+void i8259_disable_irqs(uint16_t irqmask)
 {
         uint8_t x;
@@ -112 +128 @@
 }
 
-void pic_eoi(unsigned int irq)
+void i8259_eoi(unsigned int irq)
 {
         if (irq >= PIC0_IRQ_COUNT)
@@ -119 +135 @@
 }
 
-bool pic_is_spurious(unsigned int irq)
+bool i8259_is_spurious(unsigned int irq)
 {
         pio_write_8(&saved_pic0->port1, PIC_OCW3 | PIC_OCW3_READ_ISR);
@@ -128 +144 @@
 }
 
-void pic_handle_spurious(unsigned int irq)
+void i8259_handle_spurious(unsigned int irq)
 {
         /* For spurious IRQs from pic1, we need to isssue an EOI to pic0 */