Changes in kernel/genarch/src/drivers/i8259/i8259.c [c48de91:3daba42e] in mainline

File:

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

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

@@ -32 +32 @@
 /**
  * @file
- * @brief i8259 driver.
+ * @brief PIC driver.
  *
  * Programmable Interrupt Controller for UP systems based on i8259 chip.
@@ -42 +42 @@
 #include <log.h>
 #include <interrupt.h>
-
-/* ICW1 bits */
-#define I8259_ICW1           (1 << 4)
-#define I8259_ICW1_NEEDICW4  (1 << 0)
-
-/* OCW3 bits */
-#define I8259_OCW3           (1 << 3)
-#define I8259_OCW3_READ_ISR  (3 << 0)
-
-/* OCW4 bits */
-#define I8259_OCW4           (0 << 3)
-#define I8259_OCW4_NSEOI     (1 << 5)
-
-#define I8259_IRQ_COUNT 8
-
-#define I8259_IRQ_SLAVE 2
-
-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
@@ -80 +53 @@
 
         /* ICW1: this is ICW1, ICW4 to follow */
-        pio_write_8(&pic0->port1, I8259_ICW1 | I8259_ICW1_NEEDICW4);
+        pio_write_8(&pic0->port1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
         /* ICW2: IRQ 0 maps to interrupt vector address irq0_vec */
         pio_write_8(&pic0->port2, irq0_vec);
 
-        /* ICW3: pic1 using IRQ I8259_IRQ_SLAVE */
-        pio_write_8(&pic0->port2, 1 << I8259_IRQ_SLAVE);
+        /* ICW3: pic1 using IRQ PIC0_IRQ_PIC1 */
+        pio_write_8(&pic0->port2, 1 << PIC0_IRQ_PIC1);
 
         /* ICW4: i8086 mode */
@@ -92 +65 @@
 
         /* ICW1: ICW1, ICW4 to follow */
-        pio_write_8(&pic1->port1, I8259_ICW1 | I8259_ICW1_NEEDICW4);
+        pio_write_8(&pic1->port1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
         /* ICW2: IRQ 8 maps to interrupt vector address irq0_vec + 8 */
-        pio_write_8(&pic1->port2, irq0_vec + I8259_IRQ_COUNT);
+        pio_write_8(&pic1->port2, irq0_vec + PIC0_IRQ_COUNT);
 
-        /* ICW3: pic1 is known as I8259_IRQ_SLAVE */
-        pio_write_8(&pic1->port2, I8259_IRQ_SLAVE);
+        /* ICW3: pic1 is known as PIC0_IRQ_PIC1 */
+        pio_write_8(&pic1->port2, PIC0_IRQ_PIC1);
 
         /* ICW4: i8086 mode */
         pio_write_8(&pic1->port2, 1);
 
-        /* disable all irq's */
-        i8259_disable_irqs(0xffff);
-        /* but enable I8259_IRQ_SLAVE */
-        i8259_enable_irqs(1 << I8259_IRQ_SLAVE);
+        pic_disable_irqs(0xffff);               /* disable all irq's */
+        pic_enable_irqs(1 << PIC0_IRQ_PIC1);    /* but enable PIC0_IRQ_PIC1 */
 }
 
-const char *i8259_get_name(void)
-{
-        return "i8259";
-}
-
-void i8259_enable_irqs(uint16_t irqmask)
+void pic_enable_irqs(uint16_t irqmask)
 {
         uint8_t x;
@@ -123 +89 @@
                     (uint8_t) (x & (~(irqmask & 0xff))));
         }
-        if (irqmask >> I8259_IRQ_COUNT) {
+        if (irqmask >> PIC0_IRQ_COUNT) {
                 x = pio_read_8(&saved_pic1->port2);
                 pio_write_8(&saved_pic1->port2,
-                    (uint8_t) (x & (~(irqmask >> I8259_IRQ_COUNT))));
+                    (uint8_t) (x & (~(irqmask >> PIC0_IRQ_COUNT))));
         }
 }
 
-void i8259_disable_irqs(uint16_t irqmask)
+void pic_disable_irqs(uint16_t irqmask)
 {
         uint8_t x;
@@ -139 +105 @@
                     (uint8_t) (x | (irqmask & 0xff)));
         }
-        if (irqmask >> I8259_IRQ_COUNT) {
+        if (irqmask >> PIC0_IRQ_COUNT) {
                 x = pio_read_8(&saved_pic1->port2);
                 pio_write_8(&saved_pic1->port2,
-                    (uint8_t) (x | (irqmask >> I8259_IRQ_COUNT)));
+                    (uint8_t) (x | (irqmask >> PIC0_IRQ_COUNT)));
         }
 }
 
-void i8259_eoi(unsigned int irq)
+void pic_eoi(unsigned int irq)
 {
-        if (irq >= I8259_IRQ_COUNT)
-                pio_write_8(&saved_pic1->port1, I8259_OCW4 | I8259_OCW4_NSEOI);
-        pio_write_8(&saved_pic0->port1, I8259_OCW4 | I8259_OCW4_NSEOI);
+        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);
 }
 
-bool i8259_is_spurious(unsigned int irq)
+bool pic_is_spurious(unsigned int irq)
 {
-        pio_write_8(&saved_pic0->port1, I8259_OCW3 | I8259_OCW3_READ_ISR);
-        pio_write_8(&saved_pic1->port1, I8259_OCW3 | I8259_OCW3_READ_ISR);
+        pio_write_8(&saved_pic0->port1, PIC_OCW3 | PIC_OCW3_READ_ISR);
+        pio_write_8(&saved_pic1->port1, PIC_OCW3 | PIC_OCW3_READ_ISR);
         uint8_t isr_lo = pio_read_8(&saved_pic0->port1);
         uint8_t isr_hi = pio_read_8(&saved_pic1->port1);
-        return !(((isr_hi << I8259_IRQ_COUNT) | isr_lo) & (1 << irq));
+        return !(((isr_hi << PIC0_IRQ_COUNT) | isr_lo) & (1 << irq));
 }
 
-void i8259_handle_spurious(unsigned int irq)
+void pic_handle_spurious(unsigned int irq)
 {
         /* For spurious IRQs from pic1, we need to isssue an EOI to pic0 */
-        if (irq >= I8259_IRQ_COUNT)
-                pio_write_8(&saved_pic0->port1, I8259_OCW4 | I8259_OCW4_NSEOI);
+        if (irq >= PIC0_IRQ_COUNT)
+                pio_write_8(&saved_pic0->port1, PIC_OCW4 | PIC_OCW4_NSEOI);
 }