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

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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 mainline changes.

File:

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

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

@@ -86 +86 @@
         disable_irqs_function = pic_disable_irqs;
         eoi_function = pic_eoi;
+        irqs_info = "i8259";
 
         pic_disable_irqs(0xffff);               /* disable all irq's */
@@ -121 +122 @@
 void pic_eoi(void)
 {
-        pio_write_8((ioport8_t *)0x20, 0x20);
-        pio_write_8((ioport8_t *)0xa0, 0x20);
+        pio_write_8((ioport8_t *) 0x20, 0x20);
+        pio_write_8((ioport8_t *) 0xa0, 0x20);
 }