MFC of r355574, r358095, and r358395:

Add ACPI battery subsystem man page.

Add _BIX (Battery Information Extended) object support.

ACPI Control Method Batteries have a _BIF and/or _BIX object which
provide static properties of the battery. FreeBSD acpi_cmbat module
supported _BIF object only, which was deprecated as of ACPI 4.0.
_BIX is an extended version of _BIF defined in ACPI 4.0 or later.

As of writing, _BIX has two revisions. One is in ACPI 4.0 (rev.0) and
another is in ACPI 6.0 (rev.1). It seems that hardware vendors still
stick to _BIF only or _BIX rev.0 + _BIF for the maximum compatibility.
Microsoft requires _BIX rev.0 for Windows machines, so there are some
laptop machines with _BIX rev.0 only. In this case, FreeBSD does not
recognize the battery information.

After this change, the acpi_cmbat module gets battery information from
_BIX or _BIF object and internally uses _BIX rev.1 data structure as
the primary information store in the kernel. ACPIIO_BATT_GET_BI[FX]
returns an acpi_bi[fx] structure built by using information obtained
from a _BIF or a _BIX object found on the system. The revision number
field can be used to check which field is available. The acpiconf(8)
utility will show additional information if _BIX is available.

Although ABIs of ACPIIO_BATT_* were changed, the existing APIs for
userland utilities are not changed and the backward-compatible ABIs
are provided. This means that older versions of acpiconf(8) can also
work with the new kernel. The (union acpi_battery_ioctl_arg) was
padded to 256 byte long to avoid another ABI change in the future.
A _BIX object with its revision number >1 will be treated as
compatible with the rev.1 _BIX format.

Add workaround for models which do not follow the ACPI specification strictly.
Extra objects are now simply ignored instead of rejecting everything.

Differential Revision: https://reviews.freebsd.org/D22556
Differential Revision: https://reviews.freebsd.org/D23728

MFC r339818: rcorder(8):

Add support for /etc/rc.resume, so it calls
"rcorder -k resume" and runs scripts containing "KEYWORD: resume"
with single "resume" argument.

Working example is the port sysutils/cpupdate that defines
extra_commands="resume" to reload CPU microcode cleared
by suspend/resume sequence.

This change does nothing for a system having no scripts with
KEYWORD: resume.

PR: 227866
Differential Revision: https://reviews.freebsd.org/D15247

MFC r326276:

various: general adoption of SPDX licensing ID tags.

Mainly focus on files that use BSD 2-Clause license, however the tool I
was using misidentified many licenses so this was mostly a manual - error
prone - task.

The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.

No functional change intended.

MFC: r316627 (kan)

Use int to receive the return value of getopt function.

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

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

Remove unsupported S5 (power off) state since r170976.

Reported by: Iam Smith (smithi at nimnet dot asn dot au)
MFC after: 3 days

Add META_MODE support.

Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision: D2796
Reviewed by: brooks imp

Tidy up battery status information. Remove a trailing white space.

PR: 193671

Merge ACPICA 20140926.

use .Mt to mark up email addresses consistently (part2)

PR: 191174
Submitted by: Franco Fichtner <franco@lastsummer.de>

acpiconf(8): tell users not to use -k
Add language from jhb

Requested by: jhb, jkim

acpiconf(8): check the calendar

acpiconf(8): bump .Dd

Reported by: gjb

acpiconf(8): document 'k' option

Add missing documentation for the 'k' option based on reading the source
code.

Reencode files to UTF-8. Drop CP1252 em-dash.

When ACPI reports current battery consumption rate in mAmps, print it also
in mWatts. Values in mAmps are not always suitable, because they depend on
battery voltage, which depends on battery type and charge level.

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

Import ACPICA 20090521.

Update the suspend/resume user API while maintaining backwards compat.

Improvements:
* /etc/rc.suspend,rc.resume are always run, no matter the source of the
suspend request (user or kernel, apm or acpi)
* suspend now requires positive user acknowledgement. If a user program
wants to cancel the suspend, they can. If one of the user programs
hangs or doesn't respond within 10 seconds, the system suspends anyway.
* /dev/apm is clonable, allowing multiple listeners for suspend events.
In the future, xorg-server can use this to be informed about suspend
even if there are other listeners (i.e. apmd).

Changes:
* Two new ACPI ioctls: REQSLPSTATE and ACKSLPSTATE. Request begins the
process of suspending by notifying all listeners. acpi is monitored by
devd(8) and /dev/apm listener(s) are also counted. Users register their
approval or disapproval via Ack. If anyone disapproves, suspend is vetoed.
* Old user programs or kernel modules that used SETSLPSTATE continue to
work. A message is printed once that this interface is deprecated.
* acpiconf gains the -k flag to ack the suspend request. This flag is
undocumented on purpose since it's only used by /etc/rc.suspend. It is
not intended to be a permanent change and will be removed once a better
power API is implemented.
* S5 (power off) is no longer supported via acpiconf -s 5 or apm -z/-Z.
This restores previous behavior of halt/shutdown -p being the interface.
* Miscellaneous improvements to error reporting

Approved by: re

Correct column alignment.

Fix nits in reporting battery information and add battery status reporting.
Rate units are mA/mW, not mAh/mWh. Get full battery status and time
remaining from ACPIIO_BATT_GET_BATTINFO instead of BST.

PR: bin/83672
MFC after: 2 days

Use the current BST/BIF ioctls, not the deprecated ones.

MFC after: 2 days

Fixed the misplaced $FreeBSD$.

o Report charge/discharge rate and remaining capacity in the proper
units (as specified in _BIF). (noted by Bruno Ducrot)
o In looking in the standard, if the cap numbers are 0xffffffff, then acpi
is reporting unknown for that field. Report unknown numbers properly.
o Update the state to reflect charging, discharging and critical.

phk jumped the gun and posted what looks like a preliminary version of
my patches for this information. Commit my more complete version.
This version isn't complete yet, since some details aren't handled
right just yet.

Poaching by: phk

Dump current status of battery as well.

The -i code doesn't really belong here in the first place I would think,
but keep it together for now.

Minor style(9) before possible larger commits.

Somehow I missed this last night, acpi_init() doesn't return an int.

Spotted by: Randy Bush <randy@psg.com>

With the addition of a proper prototype, this is now WARNS=6 clean.

Remove the ACPIIO_ENABLE and ACPIIO_DISABLE ioctls as well as all
callers. These ioctls attempted to enable and disable the ACPI
interpreter at runtime. In practice, it is not possible to boot with
ACPI and then disable it on many systems and trying to do so can cause
crashes, interrupt storms, etc. Binary compatibility with userland is
retained.

MFC after: 2 days

Comment out the ability to enable/disable ACPI at runtime. This appears
to not work reliably and crash some systems. It is not supported at all
on others. Pending discussion, the underlying ioctls will be removed.

Markup nit: make the list of options look better.

Fix style breakage.

Noticed by: njl

Make unprivilaged user can see battery info.

I don't normally use my middle name, so remove it from attributions in
man pages (though not from copyright notices). While I'm here, add email
addresses where appropriate.

Add support for /etc/rc.suspend and /etc/rc.resume for ACPI. They are
called directly from acpiconf(8). Change both scripts to take a
subsystem (apm|acpi) and sleep level (suspend,standby|1-5) argument.

Add the -i flag to acpiconf(8) to retrieve battery information.
Rename a few structure elements.

Allow sleep states to be specified as S1, S2, ...
This is used by zzz(8).

Support functions for the new ACPI import.
* AcpiOsDerivePciId(): finds a bus number, given the slot/func and the
acpi parse tree.
* AcpiOsPredefinedOverride(): use the sysctl hw.acpi.os_name to
override the value for _OS.

Ideas from: takawata, jhb
Reviewed by: takawata, marcel
Tested on: i386, ia64

mdoc(7) police: markup fixes.

Approved by: re

Add sleep state explanation.
Requested by: murray at Cafe in Tokyo.

The .Nm utility

Resolve conflicts arising from the ACPI CA 20020611 import.

Make the error messaging more helpful.

PR: 31483
Approved by: iwasaki, ru
MFC after: 4 days

ACPI CA doesn't recognis S4BIOS as a seperate sleep type anymore, so
drop support for it here until we work out a better way of handling it.

Remove whitespace at EOL.

Remove double //'s in path.

Catch up to new include paths.

Submitted by: walt <wsheets@att.net>

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

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

mdoc(7) police: .Dv -> .Cm where appropriate.

Spell my name right in the copyright.

Oops, forgotten to add manpage.

Add manpage for acpiconf.

Submitted by: des

Remove dependence on old acpi driver from acpi userland tools.

- acpiconf Replace include files from old acpi driver to acpica driver.
New sleep type `4b' had been added (S4BIOS) for `-s' option.
Of course this has no effect because driver doesn't
support it for now :-)

- acpidump All needed structs in sys/dev/acpi/*.h had been merged
into local header file. No changes on its usage.

Update include paths for new header locations.

Submitted by: iwasaki

This commit was generated by cvs2svn to compensate for changes in r65283,
which included commits to RCS files with non-trunk default branches.