diff options
| author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2007-05-03 18:51:09 +0000 |
|---|---|---|
| committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2007-05-03 18:51:09 +0000 |
| commit | 615596163a04038381e3aa3bdee5b62150be1813 (patch) | |
| tree | 397dc9888e033ccedf11a51aa81882be25c40c86 /sys/arch/amd64 | |
| parent | eedd5ea329da5b156cddc491df51010c67bc886a (diff) | |
Remove MCA ghosts, no changes in .o files.
Free commit ticket from miod@.
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/i8259.c | 18 | ||||
| -rw-r--r-- | sys/arch/amd64/isa/clock.c | 31 |
2 files changed, 4 insertions, 45 deletions
diff --git a/sys/arch/amd64/amd64/i8259.c b/sys/arch/amd64/amd64/i8259.c index 1240608c5a7..780a36321b3 100644 --- a/sys/arch/amd64/amd64/i8259.c +++ b/sys/arch/amd64/amd64/i8259.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.c,v 1.4 2005/12/13 00:18:19 jsg Exp $ */ +/* $OpenBSD: i8259.c,v 1.5 2007/05/03 18:51:08 grange Exp $ */ /* $NetBSD: i8259.c,v 1.2 2003/03/02 18:27:15 fvdl Exp $ */ /* @@ -113,13 +113,7 @@ struct pic i8259_pic = { void i8259_default_setup(void) { -#if NMCA > 0 - /* level-triggered interrupts on MCA PS/2s */ - if (MCA_system) - outb(IO_ICU1, 0x19); /* reset; program device, four bytes */ - else -#endif - outb(IO_ICU1, 0x11); /* reset; program device, four bytes */ + outb(IO_ICU1, 0x11); /* reset; program device, four bytes */ outb(IO_ICU1+1, ICU_OFFSET); /* starting at this vector index */ outb(IO_ICU1+1, 1 << IRQ_SLAVE); /* slave on line 2 */ @@ -135,13 +129,7 @@ i8259_default_setup(void) outb(IO_ICU1, 0xc0 | (3 - 1)); /* pri order 3-7, 0-2 (com2 first) */ #endif -#if NMCA > 0 - /* level-triggered interrupts on MCA PS/2s */ - if (MCA_system) - outb(IO_ICU2, 0x19); /* reset; program device, four bytes */ - else -#endif - outb(IO_ICU2, 0x11); /* reset; program device, four bytes */ + outb(IO_ICU2, 0x11); /* reset; program device, four bytes */ outb(IO_ICU2+1, ICU_OFFSET+8); /* staring at this vector index */ outb(IO_ICU2+1, IRQ_SLAVE); diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c index 1444b953746..6430d247595 100644 --- a/sys/arch/amd64/isa/clock.c +++ b/sys/arch/amd64/isa/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.11 2007/01/15 23:19:05 jsg Exp $ */ +/* $OpenBSD: clock.c,v 1.12 2007/05/03 18:51:08 grange Exp $ */ /* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /*- @@ -411,31 +411,6 @@ cmoscheck(void) + mc146818_read(NULL, 0x2f)); } -#if NMCA > 0 -/* - * Check whether the CMOS layout is PS/2 like, to be called at splclock(). - */ -static int cmoscheckps2(void); -static int -cmoscheckps2(void) -{ -#if 0 - /* Disabled until I find out the CRC checksum algorithm IBM uses */ - int i; - unsigned short cksum = 0; - - for (i = 0x10; i <= 0x31; i++) - cksum += mc146818_read(NULL, i); /* XXX softc */ - - return (cksum == (mc146818_read(NULL, 0x32) << 8) - + mc146818_read(NULL, 0x33)); -#else - /* Check 'incorrect checksum' bit of IBM PS/2 Diagnostic Status Byte */ - return ((mc146818_read(NULL, NVRAM_DIAG) & (1<<6)) == 0); -#endif -} -#endif /* NMCA > 0 */ - /* * patchable to control century byte handling: * 1: always update @@ -465,10 +440,6 @@ clock_expandyear(int clockyear) s = splclock(); if (cmoscheck()) cmoscentury = mc146818_read(NULL, NVRAM_CENTURY); -#if NMCA > 0 - else if (MCA_system && cmoscheckps2()) - cmoscentury = mc146818_read(NULL, (centb = 0x37)); -#endif else cmoscentury = 0; splx(s); |