Changeset 06ae793 in mainline

Timestamp:

2018-02-13T20:14:25Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9658879

Parents:

448e093

Message:

i8259: Do not use magic numbers

Location:

kernel/arch/ia32

Files:

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

kernel/arch/ia32/include/arch/drivers/i8259.h

@@ -44 +44 @@
 #define PIC_PIC1PORT2  ((ioport8_t *) 0xa1U)
 
-#define PIC_NEEDICW4  (1 << 0)
-#define PIC_ICW1      (1 << 4)
+/* ICW1 bits */
+#define PIC_ICW1           (1 << 4)
+#define PIC_ICW1_NEEDICW4  (1 << 0)
+
+/* OCW4 bits */
+#define PIC_OCW4           (0 << 3)
+#define PIC_OCW4_NSEOI     (1 << 5)
 
 extern void i8259_init(void);

kernel/arch/ia32/src/drivers/i8259.c

@@ -50 +50 @@
 {
         /* ICW1: this is ICW1, ICW4 to follow */
-        pio_write_8(PIC_PIC0PORT1, PIC_ICW1 | PIC_NEEDICW4);
+        pio_write_8(PIC_PIC0PORT1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
         /* ICW2: IRQ 0 maps to INT IRQBASE */
@@ -62 +62 @@
 
         /* ICW1: ICW1, ICW4 to follow */
-        pio_write_8(PIC_PIC1PORT1, PIC_ICW1 | PIC_NEEDICW4);
+        pio_write_8(PIC_PIC1PORT1, PIC_ICW1 | PIC_ICW1_NEEDICW4);
 
         /* ICW2: IRQ 8 maps to INT (IVT_IRQBASE + 8) */
@@ -122 +122 @@
 void pic_eoi(void)
 {
-        pio_write_8((ioport8_t *) 0x20, 0x20);
-        pio_write_8((ioport8_t *) 0xa0, 0x20);
+        pio_write_8(PIC_PIC0PORT1, PIC_OCW4 | PIC_OCW4_NSEOI);
+        pio_write_8(PIC_PIC1PORT1, PIC_OCW4 | PIC_OCW4_NSEOI);
 }