diff options
author | msmith <msmith@FreeBSD.org> | 1998-12-10 23:36:14 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 1998-12-10 23:36:14 +0000 |
commit | f7e9d3183a367c8a033e58d05c9cb57277dacadf (patch) | |
tree | f318c242ddf2abf643e0898e3c04d1faa4949f44 /sys/i386 | |
parent | 6c6616f30ea7619b3420cb0ecd03073f64352ace (diff) | |
download | FreeBSD-src-f7e9d3183a367c8a033e58d05c9cb57277dacadf.zip FreeBSD-src-f7e9d3183a367c8a033e58d05c9cb57277dacadf.tar.gz |
Perform APM power-off on power-off request, not halt request.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/apm/apm.c | 6 | ||||
-rw-r--r-- | sys/i386/bios/apm.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index a851d3d..42515c8 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.75 1998/10/30 05:41:13 msmith Exp $ + * $Id: apm.c,v 1.76 1998/12/04 21:28:39 archie Exp $ */ #include "opt_devfs.h" @@ -251,8 +251,8 @@ apm_power_off(int howto, void *junk) { u_long eax, ebx, ecx, edx; - /* Not halting, or not active */ - if (!(howto & RB_HALT) || !apm_softc.active) + /* Not halting powering off, or not active */ + if (!(howto & RB_POWEROFF) || !apm_softc.active) return; eax = (APM_BIOS << 8) | APM_SETPWSTATE; ebx = PMDV_ALLDEV; diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index a851d3d..42515c8 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.75 1998/10/30 05:41:13 msmith Exp $ + * $Id: apm.c,v 1.76 1998/12/04 21:28:39 archie Exp $ */ #include "opt_devfs.h" @@ -251,8 +251,8 @@ apm_power_off(int howto, void *junk) { u_long eax, ebx, ecx, edx; - /* Not halting, or not active */ - if (!(howto & RB_HALT) || !apm_softc.active) + /* Not halting powering off, or not active */ + if (!(howto & RB_POWEROFF) || !apm_softc.active) return; eax = (APM_BIOS << 8) | APM_SETPWSTATE; ebx = PMDV_ALLDEV; |