Changeset ee820ff in mainline for kernel/arch/ia32/src/drivers/i8259.c

Timestamp:

2018-02-22T19:39:53Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

0539c14

Parents:

5fe3f954 (diff), df368491 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'df368491aa1c0ce3024a51c602b7d0cbe4bd84d3'

File:

• kernel/arch/ia32/src/drivers/i8259.c (modified) (3 diffs)

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);
 }