Changeset e28175d in mainline for kernel/arch/ia32/src/drivers/i8254.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• kernel/arch/ia32/src/drivers/i8254.c (modified) (1 diff)

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

@@ -96 +96 @@
 {
         pio_write_8(CLK_PORT4, 0x36);
-        pic_disable_irqs(1 << IRQ_CLK);
+        i8259_disable_irqs(1 << IRQ_CLK);
         pio_write_8(CLK_PORT1, (CLK_CONST / HZ) & 0xf);
         pio_write_8(CLK_PORT1, (CLK_CONST / HZ) >> 8);
-        pic_enable_irqs(1 << IRQ_CLK);
+        i8259_enable_irqs(1 << IRQ_CLK);
 }