From bdf762c6f9473939030b7fa139f1ddf4b8898edf Mon Sep 17 00:00:00 2001 From: nate Date: Wed, 22 Oct 1997 23:04:07 +0000 Subject: [PATCH] - If APM_BROKEN_STATCLOCK is defined, make sure the statcloock is disabled, don't rely on the flags to set it. --- sys/i386/apm/apm.c | 4 +++- sys/i386/bios/apm.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index e6bc26bf1f9..0c17d188da9 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.59 1997/06/19 00:25:03 wollman Exp $ + * $Id: apm.c,v 1.60 1997/09/21 21:33:10 gibbs Exp $ */ #include @@ -592,7 +592,9 @@ apmprobe(struct isa_device *dvp) printf("apm: 32-bit connection error.\n"); return 0; } +#ifndef APM_BROKEN_STATCLOCK if (dvp->id_flags & 0x20) +#endif statclock_disable = 1; return -1; } diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index e6bc26bf1f9..0c17d188da9 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.59 1997/06/19 00:25:03 wollman Exp $ + * $Id: apm.c,v 1.60 1997/09/21 21:33:10 gibbs Exp $ */ #include @@ -592,7 +592,9 @@ apmprobe(struct isa_device *dvp) printf("apm: 32-bit connection error.\n"); return 0; } +#ifndef APM_BROKEN_STATCLOCK if (dvp->id_flags & 0x20) +#endif statclock_disable = 1; return -1; } -- 2.45.2