summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/apm/apm.838
-rw-r--r--usr.sbin/apm/apm.c10
2 files changed, 26 insertions, 22 deletions
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 45407b60eff..61b97e2143c 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: apm.8,v 1.23 2005/12/02 04:27:52 beck Exp $
+.\" $OpenBSD: apm.8,v 1.24 2005/12/02 04:33:26 deraadt Exp $
.\"
.\" Copyright (c) 1996 John T. Kohl
.\" All rights reserved.
@@ -52,10 +52,6 @@ displays the current power management state in verbose form.
.Pp
The options are as follows:
.Bl -tag -width Ds
-.It Fl A
-Set
-.Xr apmd 8
-to automatic performance adjustment mode.
.It Fl a
Display the external charger (A/C status).
0 means disconnected, 1
@@ -73,18 +69,6 @@ Set the name of the socket via which to contact
.Xr apmd 8
to
.Pa sockname .
-.It Fl H
-Set
-.Xr apmd 8
-to manual performance adjustment mode and
-.Va hw.setperf
-to 100.
-.It Fl L
-Set
-.Xr apmd 8
-to manual performance adjustment mode and
-.Va hw.setperf
-to 0.
.It Fl l
Display the estimated battery lifetime (in percent).
.It Fl m
@@ -101,6 +85,26 @@ Display if power management is enabled.
Request more verbose description of the displayed states.
.It Fl z
Put the system into suspend (deep sleep) mode.
+.It Fl A
+Set
+.Xr apmd 8
+to automatic performance adjustment mode.
+.It Fl C
+Set
+.Xr apmd 8
+to cool running performance adjustment mode.
+.It Fl H
+Set
+.Xr apmd 8
+to manual performance adjustment mode and
+.Va hw.setperf
+to 100.
+.It Fl L
+Set
+.Xr apmd 8
+to manual performance adjustment mode and
+.Va hw.setperf
+to 0.
.El
.Pp
The
diff --git a/usr.sbin/apm/apm.c b/usr.sbin/apm/apm.c
index 9f6aa554693..e328a999dc1 100644
--- a/usr.sbin/apm/apm.c
+++ b/usr.sbin/apm/apm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apm.c,v 1.14 2005/12/02 04:27:52 beck Exp $ */
+/* $OpenBSD: apm.c,v 1.15 2005/12/02 04:33:27 deraadt Exp $ */
/*
* Copyright (c) 1996 John T. Kohl
@@ -58,8 +58,8 @@ int send_command(int fd, struct apm_command *cmd, struct apm_reply *reply);
void
usage(void)
{
- fprintf(stderr,"usage: %s [-ablmPSsvz] [-f sockname]"
- " [-C | -A | -L | -H]\n", __progname);
+ fprintf(stderr,"usage: %s [-AabCHLlmPSsvz] [-f sockname]\n",
+ __progname);
exit(1);
}
@@ -86,7 +86,7 @@ send_command(int fd, struct apm_command *cmd, struct apm_reply *reply)
warn("invalid send to APM daemon");
return (1);
}
- return 0;
+ return (0);
}
int
@@ -130,7 +130,7 @@ open_socket(const char *sockname)
errno = errr;
err(1, "cannot open connection to APM daemon");
}
- return sock;
+ return (sock);
}
int