From 026a4538e37907b88f138d34fc8198c2dbd77473 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 19 May 2014 00:24:12 +0200 Subject: [PATCH] acpi: s/ACPI[ -]CA/ACPICA/ in a few places. --- share/man/man4/acpi.4 | 16 ++++++++-------- sys/dev/acpica/Makefile | 2 +- sys/dev/acpica/Osd/OsdMemory.c | 2 +- sys/dev/acpica/acpi.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index 1a0fc54082..2cf4497c17 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -44,7 +44,7 @@ standard. This support includes platform hardware discovery (superseding the PnP and PCI BIOS), as well as power management (superseding APM) and other features. -ACPI core support is provided by the ACPI CA reference implementation +ACPI core support is provided by the ACPICA reference implementation from Intel. .Pp Note that the @@ -402,7 +402,7 @@ the region to be avoided in the kernel environment variable .Va debug.acpi.avoid . The object and all of its children will be ignored during the bus/children scan of the namespace. -The ACPI CA code will still know about the avoided region. +The ACPICA code will still know about the avoided region. .Sh DEBUGGING OUTPUT To enable debugging output, .Nm @@ -418,10 +418,10 @@ tokens, with layers listed in and levels in .Va debug.acpi.level . .Pp -The first set of layers is for ACPI-CA components, and the second is for +The first set of layers is for ACPICA components, and the second is for .Dx drivers. -The ACPI-CA layer descriptions include the prefix for the files they +The ACPICA layer descriptions include the prefix for the files they refer to. The supported layers are: .Pp @@ -451,7 +451,7 @@ Usermode support routines ("os") .It Li ACPI_CA_DISASSEMBLER Disassembler implementation (unused) .It Li ACPI_ALL_COMPONENTS -All the above ACPI-CA components +All the above ACPICA components .It Li ACPI_AC_ADAPTER AC adapter driver .It Li ACPI_BATTERY @@ -538,7 +538,7 @@ Selection of the appropriate layer and level values is important to avoid massive amounts of debugging output. For example, the following configuration is a good way to gather initial information. -It enables debug output for both ACPI-CA and the +It enables debug output for both ACPICA and the .Nm driver, printing basic information about errors, warnings, and progress. .Bd -literal -offset indent @@ -546,7 +546,7 @@ debug.acpi.layer="ACPI_ALL_COMPONENTS ACPI_ALL_DRIVERS" debug.acpi.level="ACPI_LV_ALL_EXCEPTIONS" .Ed .Pp -Debugging output by the ACPI CA subsystem is prefixed with the +Debugging output by the ACPICA subsystem is prefixed with the module name in lowercase, followed by a source line number. Output from the .Dx Ns -local @@ -611,7 +611,7 @@ utilities and some ACPI knowledge. .Re .Sh AUTHORS .An -nosplit -The ACPI CA subsystem is developed and maintained by +The ACPICA subsystem is developed and maintained by Intel Architecture Labs. .Pp The following people made notable contributions to the ACPI subsystem diff --git a/sys/dev/acpica/Makefile b/sys/dev/acpica/Makefile index 5a648f277a..3bdf404070 100644 --- a/sys/dev/acpica/Makefile +++ b/sys/dev/acpica/Makefile @@ -29,7 +29,7 @@ CFLAGS+= -DACPI_DEBUG_CACHE KMOD = acpi -# ACPI CA sources +# ACPICA sources SRCS+= ahids.c SRCS+= dbcmds.c dbconvert.c dbdisply.c dbexec.c dbfileio.c dbhistry.c SRCS+= dbinput.c dbstats.c dbtest.c dbutils.c dbxface.c diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c index d456514335..fcb41970f4 100644 --- a/sys/dev/acpica/Osd/OsdMemory.c +++ b/sys/dev/acpica/Osd/OsdMemory.c @@ -39,7 +39,7 @@ #include #include -MALLOC_DEFINE(M_ACPICA, "acpica", "ACPI CA memory pool"); +MALLOC_DEFINE(M_ACPICA, "acpica", "ACPICA memory pool"); struct acpi_memtrack { struct acpi_memtrack *next; diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index ca9fdc86dd..32d861efed 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -226,7 +226,7 @@ static const char* sleep_state_names[] = { SYSCTL_NODE(_debug, OID_AUTO, acpi, CTLFLAG_RD, NULL, "ACPI debugging"); static char acpi_ca_version[12]; SYSCTL_STRING(_debug_acpi, OID_AUTO, acpi_ca_version, CTLFLAG_RD, - acpi_ca_version, 0, "Version of Intel ACPI-CA"); + acpi_ca_version, 0, "Version of Intel ACPICA"); /* * Use this tunable to disable the control method auto-serialization -- 2.41.0