diff options
| -rw-r--r-- | usr.sbin/apm/apm.c | 9 | ||||
| -rw-r--r-- | usr.sbin/apmd/apm-proto.h | 4 | ||||
| -rw-r--r-- | usr.sbin/apmd/apmd.c | 3 | ||||
| -rw-r--r-- | usr.sbin/apmd/apmsubr.c | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c index 69aba9a3c8a..c91b8da9ba9 100644 --- a/usr.sbin/apm/apm.c +++ b/usr.sbin/apm/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.36 2019/06/28 13:32:46 deraadt Exp $ */ +/* $OpenBSD: apm.c,v 1.37 2020/09/23 05:50:26 jca Exp $ */ /* * Copyright (c) 1996 John T. Kohl @@ -185,14 +185,10 @@ main(int argc, char *argv[]) action = HIBERNATE; break; case 'A': - if (action != NONE) - usage(); - action = SETPERF_AUTO; - break; case 'C': if (action != NONE) usage(); - action = SETPERF_COOL; + action = SETPERF_AUTO; break; case 'H': if (action != NONE) @@ -277,7 +273,6 @@ main(int argc, char *argv[]) case SETPERF_LOW: case SETPERF_HIGH: case SETPERF_AUTO: - case SETPERF_COOL: if (fd == -1) errx(1, "cannot connect to apmd, " "not changing performance adjustment mode"); diff --git a/usr.sbin/apmd/apm-proto.h b/usr.sbin/apmd/apm-proto.h index 0d5716eb1a0..4d54947fe85 100644 --- a/usr.sbin/apmd/apm-proto.h +++ b/usr.sbin/apmd/apm-proto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apm-proto.h,v 1.9 2012/03/26 20:17:45 deraadt Exp $ */ +/* $OpenBSD: apm-proto.h,v 1.10 2020/09/23 05:50:26 jca Exp $ */ /* * Copyright (c) 1996 John T. Kohl @@ -38,7 +38,6 @@ enum apm_action { SETPERF_LOW, SETPERF_HIGH, SETPERF_AUTO, - SETPERF_COOL }; enum apm_state { @@ -52,7 +51,6 @@ enum apm_perfmode { PERF_NONE = -1, PERF_MANUAL, PERF_AUTO, - PERF_COOL }; struct apm_command { diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c index 1cb0833f50c..788085ae636 100644 --- a/usr.sbin/apmd/apmd.c +++ b/usr.sbin/apmd/apmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apmd.c,v 1.96 2020/03/13 09:08:58 jca Exp $ */ +/* $OpenBSD: apmd.c,v 1.97 2020/09/23 05:50:26 jca Exp $ */ /* * Copyright (c) 1995, 1996 John T. Kohl @@ -302,7 +302,6 @@ handle_client(int sock_fd, int ctl_fd) setperfpolicy("high"); break; case SETPERF_AUTO: - case SETPERF_COOL: doperf = PERF_AUTO; reply.newstate = NORMAL; logmsg(LOG_NOTICE, "setting hw.perfpolicy to auto"); diff --git a/usr.sbin/apmd/apmsubr.c b/usr.sbin/apmd/apmsubr.c index 5af4ab98546..9a8232e498f 100644 --- a/usr.sbin/apmd/apmsubr.c +++ b/usr.sbin/apmd/apmsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apmsubr.c,v 1.8 2006/03/15 20:30:28 sturm Exp $ */ +/* $OpenBSD: apmsubr.c,v 1.9 2020/09/23 05:50:26 jca Exp $ */ /* * Copyright (c) 1995,1996 John T. Kohl @@ -79,8 +79,6 @@ perf_mode(int mode) return "manual"; case PERF_AUTO: return "auto"; - case PERF_COOL: - return "cool running"; default: return "invalid"; } |