diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-01-30 07:33:14 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:14 -0500 |
commit | 466eed22d127a1f16e1251cdc54a9f8f944140c0 (patch) | |
tree | f9b85efa895f3e2dd7f112a4aded5b2ae0bd0ca2 /arch/x86/kernel/apm_32.c | |
parent | fb8830e72d9bd86f1e7b6886cb1886c391130f86 (diff) |
x86: isolate PIC/PIT in/out calls
Rather than remove and/or mangle inb_p/outb_p we want to remove the use
of them from inappropriate places. For the PIC/PIT this may eventually
depend on 32/64bitism or similar so start by adding inb/outb_pit and
inb/outb_pic so that we can make them use any scheme we settle on without
disturbing the existing, correct (for ISA), port 0x80 usage. (eg we can
make inb_pit use udelay without messing up inb_p).
Floppy already does this for the fdc. That really only leaves the CMOS as
a core logic item to tackle, and bits of parallel port handling in the
chipset layers.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apm_32.c')
-rw-r--r-- | arch/x86/kernel/apm_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 955dd43b1676..d4438ef296d8 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -1174,11 +1174,11 @@ static void reinit_timer(void) | |||
1174 | 1174 | ||
1175 | spin_lock_irqsave(&i8253_lock, flags); | 1175 | spin_lock_irqsave(&i8253_lock, flags); |
1176 | /* set the clock to HZ */ | 1176 | /* set the clock to HZ */ |
1177 | outb_p(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ | 1177 | outb_pit(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ |
1178 | udelay(10); | 1178 | udelay(10); |
1179 | outb_p(LATCH & 0xff, PIT_CH0); /* LSB */ | 1179 | outb_pit(LATCH & 0xff, PIT_CH0); /* LSB */ |
1180 | udelay(10); | 1180 | udelay(10); |
1181 | outb(LATCH >> 8, PIT_CH0); /* MSB */ | 1181 | outb_pit(LATCH >> 8, PIT_CH0); /* MSB */ |
1182 | udelay(10); | 1182 | udelay(10); |
1183 | spin_unlock_irqrestore(&i8253_lock, flags); | 1183 | spin_unlock_irqrestore(&i8253_lock, flags); |
1184 | #endif | 1184 | #endif |