Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Mark global functions and/or variables in apm(8) static where possible.

This allows compilers and static analyzers to do more thorough analysis.

MFtbemd:

Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want
to test of all the CPUs of a given family conform.

Garbage collect unused variable, missed in r200840

Found by: clang static analyzer

The last big commit: let usr.sbin/ use WARNS=6 by default.

apm(8) is no longer linked to zzz(8), catch up.
(Fixes "zzz" clash in the whatis(1) database.)

Copy apm(4) emulation from sys/i386/acpica/acpi_machdep.c and
install apm(8) and apm_bios.h on amd64.

Make apm(8) understand AC Line state 2 as "backup power".

Submitted by: liamfoy@sepulcrum.org

Expand *n't contractions.

Sort sections.

o Remove duplicate includes.

PR: bin/75712
Submitted by: brueffer
Obtained from: Dragonfly BSD

Mechanically kill hard sentence breaks.

Fix to not use 255, but instead use APM_UNKNOWN.
Compare things correctly against -1 or 0
Don't print any capabilities if unknown is returned from the kernel.

Reviewed/Submitted by: njl, Liam Foy

Remove a duplicated printf().

Submitted by: Niki Denev <nike_d@cytexbg.com>

Tabs were accidentally lost in the last commit.

Submitted by: Liam J. Foy <liamfoy@sepulcrum.org>

Factor out some duplicated code and fix some style(9) issues.

Submitted by: Liam J. Foy <liamfoy@sepulcrum.org>

Check for >= 255 since sign extension from byte to u_int sometimes makes
the value for "unknown" 0xffffffff. The underlying kernel drivers should
be updated to only return 255 but the ABI is used by too many userland
utilities.

Also, make this WARNS 6 compatible.

Mark APM manpages as i386-only.

Remove the zzz files since they have been moved to src/usr.sbin/zzz

Change zzz to be a shell script that checks for APM or ACPI support and
suspends the system appropriately.

Submitted by: Mark Santcroos <marks@ripe.net>

If mktime() or timegm() return -1, print out the resume timer value as
"unknown", rather than a conversion of -1 to a date/timestamp.

Assorted mdoc(7) fixes.

Approved by: re (blanket)

The -t flag in the retired apmconf.8 is the same as "-h false" in the
apm.8. Since the -t flag in the apm.8 is something different entirely,
the reference to -t was quite confusing. Fix that.

Fix a typo: "Managment" -> "Management".

PR: bin/47343
Submitted by: Jeremy C. Reed <reed@reedmedia.net>
MFC after: 4 days

style.Makefile(5)

mdoc(7) police: Deal with self-xrefs.

Add missing .Nm. Add FBSDID. fprintf -> warnx. Lowercase first letter inside
err().

Remove extra args to printf
use Capabilities rather than Capacities.

Submitted by: kkenn

Don't dump all information about apm when only asked to enable/disable apm
functions (-e and -h switches). This should make apm(8) self-consistent, as
for example -d enable|disable doesn't dump such info.

MFC after: 5 days

The .Nm utility

Minor grammar fix:
s/will be resume/will be resumed/

mdoc(7) police: join split punctuation to macro calls.

Remove whitespace at EOL.

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Set the default manual section for usr.sbin/ to 8.

mdoc(7) police: use the new features of the Nm macro.

Add missing "delta" argument to description headline of "apm" -r option
to be consistent with descriptions of other options which take arguments.

Add output of per battery information to apm(1).
New ioctl APMIO_GETPWSTATUS is introduced.

Reviewed by: -mobile and -current folks (no objection)

If caller have privilege to r/w access to /dev/apm, show the
info about resume timer and resume on ring indicator, again.

Reviewed by: imp

apm -d also needs a writable file descriptor.

When we're just reading info from the driver, attempt to open the apm
device read only so we can suppot a readonly apm device.

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Fixed breakage of installation of zzz.8 in previous commit. MLINKS
consists of pairs of link names.

Add MLINK for apmconf(8).

Suggested by: msmith

Reflect that apmconf(8) has been absorbed by apm(8).

Suggested by: msmith

Import the apmconf function descriptions as per modified patch
from green.

Cleanups, new options, and syntax changes w.r.t. the -e fiag I had just
added. This completes the addition of apmconf(8) features into apm(8),
and will be followed shortly by asmodai with a manpage commit.

Add the apm -e argument, which will toggle the "enabled" status of APM.

$Id$ -> $FreeBSD$

Change to continue process after calling `Get Resume TImer' APM
BIOS function (supported in v1.2) on older BIOS version (v1.1 or 1.0).

Reviewed by: -mobile ML folks.

Reenable use of the APMIO_BIOS ioctl for now.

Erk, more APMIO_BIOS stuff I missed. Temporarily disable the resume timer
support until I can implement it as an ioctl proper.

Submitted by: N.Dudorov <nnd@mail.nsk.ru>

Make bcd2int work (resume time reporting now works.)

PR: 12613
Submitted by: Michael Constant <mconst@not.there.com>

Make wall_cmos do something.

PR: 12614

Add $Id$, to make it simpler for members of the translation teams to
track.

The Id line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

.\" $Id$
.\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by: bde

o Enable standby mode in apm utility. You need a newer kernel for this
functionality to work (however, the kernel changes were committed
to current at 1998/07/05 23:29:11 PDT).
o Enable setting of a timer for later wakeup. Note, not all APM
BIOSes support this for all modes (mine doesn't support waking up on
a timer from standby mode).
o Print out the APM capabilities, as reported by the BIOS.
o Report wake on ring indication. No way to enable/disable this, but
it is reported.
o update man page with above
o The output of this command has changed, so if you have a script that
parses its output, then you may need to rewrite it slightly.
o The code attempts to deal with older kernels than July 5, 1998, but
that part of the code isn't well tested.

.Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq.

Updated my e-mail addresses.

Fix a couple of typos.

PR: 5561
Submitted by: Kazuo Horikawa <k-horik@yk.rim.or.jp>

Output the estimated battery lifetime as "hh:mm:ss" along with
everything else. Add a "-t" option for outputting it in raw form.
Define and document the order in which raw values are printed when
more than one is requested on the command line.

Use warn rather than warnx to report errors opening the APM device.
Nit formatting fix

Correct the description of the output from the "-s" option. It was
backward.

Use err(3). Typo in man page.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Remove an un-needed static declaration.

Re-write the driver to use getopt(), add the new display suspend
function of the kernel, and other assorted misc. cleanups.

Submitted by: nate & HOSOKAWA, Tatsumi <hosokawa@jp.FreeBSD.org>

delete MANDIR=/usr/share/man/man,
it breaks `env MANDIR=<dir> make maninstall'

Open up /dev/apm instead of /dev/apm0.

Add the '-s' flag to apm which returns the status of the APM support
(enable/disabled) now that the APM_GETINFO ioctl returns the necessary
information. Also, print out the status along with the other
information as the default behavior.

Remove trailing whitespace.

make the right link to "zzz"

Fixed a #include to point to machine/apm_bios.h

The latest user-land changes from the author. I added a big warning to the
apm.4 man-page. I also hope the Makefiles make sense now.

Submitted by: HOSOKAWA Tatsumi

Stop "make install" from falling over if DESTDIR is defined.

Laptop Advanced Power Management support (userland end) by HOSOKAWA Tatsumi.

Submitted by: HOSOKAWA Tatsumi