diff options
Diffstat (limited to 'arch/x86/kernel/i8259_32.c')
-rw-r--r-- | arch/x86/kernel/i8259_32.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c index f201e7da1bbc..2d25b77102fe 100644 --- a/arch/x86/kernel/i8259_32.c +++ b/arch/x86/kernel/i8259_32.c | |||
@@ -289,20 +289,20 @@ void init_8259A(int auto_eoi) | |||
289 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */ | 289 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */ |
290 | 290 | ||
291 | /* | 291 | /* |
292 | * outb_p - this has to work on a wide range of PC hardware. | 292 | * outb_pic - this has to work on a wide range of PC hardware. |
293 | */ | 293 | */ |
294 | outb_p(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | 294 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ |
295 | outb_p(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ | 295 | outb_pic(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ |
296 | outb_p(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ | 296 | outb_pic(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ |
297 | if (auto_eoi) /* master does Auto EOI */ | 297 | if (auto_eoi) /* master does Auto EOI */ |
298 | outb_p(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | 298 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); |
299 | else /* master expects normal EOI */ | 299 | else /* master expects normal EOI */ |
300 | outb_p(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | 300 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); |
301 | 301 | ||
302 | outb_p(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | 302 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ |
303 | outb_p(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ | 303 | outb_pic(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ |
304 | outb_p(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ | 304 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ |
305 | outb_p(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ | 305 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ |
306 | if (auto_eoi) | 306 | if (auto_eoi) |
307 | /* | 307 | /* |
308 | * In AEOI mode we just have to mask the interrupt | 308 | * In AEOI mode we just have to mask the interrupt |