From: Sascha Wildner Date: Sat, 15 Nov 2014 12:07:52 +0000 (+0100) Subject: kernel: Refer to it as "ACPICA", not "ACPI CA" or "ACPI-CA". X-Git-Tag: v4.2.0rc~1487 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/9d1f0c52aa26c5bd75507a9e9829044549b681e5 kernel: Refer to it as "ACPICA", not "ACPI CA" or "ACPI-CA". --- diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c index 2912004ce8..a900adcdfd 100644 --- a/sys/dev/acpica/Osd/OsdSynch.c +++ b/sys/dev/acpica/Osd/OsdSynch.c @@ -368,7 +368,7 @@ AcpiOsDeleteLock (ACPI_SPINLOCK Spin) * OS-dependent locking primitives. These routines should be able to be * called from an interrupt-handler or cpu_idle thread. * - * NB: some of ACPI-CA functions with locking flags, say AcpiSetRegister(), + * NB: some of ACPICA functions with locking flags, say AcpiSetRegister(), * are changed to unconditionally call AcpiOsAcquireLock/AcpiOsReleaseLock. */ ACPI_CPU_FLAGS diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index bc0562ddc6..00149a6e98 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -69,7 +69,7 @@ MALLOC_DEFINE(M_ACPIDEV, "acpidev", "ACPI devices"); -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("ACPI") @@ -468,7 +468,7 @@ acpi_attach(device_t dev) ACPI_SERIAL_INIT(acpi); /* - * Set the globals from our tunables. This is needed because ACPI-CA + * Set the globals from our tunables. This is needed because ACPICA * uses UINT8 for some values and we have no tunable_byte. */ AcpiGbl_AutoSerializeMethods = acpi_auto_serialize_methods ? TRUE : FALSE; @@ -482,7 +482,7 @@ acpi_attach(device_t dev) AcpiDbgLevel &= ~ACPI_LV_DEBUG_OBJECT; #endif - /* Start up the ACPI CA subsystem. */ + /* Start up the ACPICA subsystem. */ status = AcpiInitializeSubsystem(); if (ACPI_FAILURE(status)) { device_printf(dev, "Could not initialize Subsystem: %s\n", diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c index 806ee91eaa..7d51bb2da5 100644 --- a/sys/dev/acpica/acpi_acad.c +++ b/sys/dev/acpica/acpi_acad.c @@ -44,7 +44,7 @@ #include #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_AC_ADAPTER ACPI_MODULE_NAME("AC_ADAPTER") diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c index 0bda461f07..67db1ec297 100644 --- a/sys/dev/acpica/acpi_button.c +++ b/sys/dev/acpica/acpi_button.c @@ -39,7 +39,7 @@ #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_BUTTON ACPI_MODULE_NAME("BUTTON") diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index 401a908487..414c5cd43e 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -47,7 +47,7 @@ /* Check the battery once a minute. */ #define CMBAT_POLLRATE (60 * hz) -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_BATTERY ACPI_MODULE_NAME("BATTERY") diff --git a/sys/dev/acpica/acpi_cpu_cstate.c b/sys/dev/acpica/acpi_cpu_cstate.c index 8bffd57a9d..f94e8f4023 100644 --- a/sys/dev/acpica/acpi_cpu_cstate.c +++ b/sys/dev/acpica/acpi_cpu_cstate.c @@ -61,7 +61,7 @@ * Support for ACPI Processor devices, including C[1-3+] sleep states. */ -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_PROCESSOR ACPI_MODULE_NAME("PROCESSOR") diff --git a/sys/dev/acpica/acpi_dock/acpi_dock.c b/sys/dev/acpica/acpi_dock/acpi_dock.c index 984ce38fde..fb7f75e026 100644 --- a/sys/dev/acpica/acpi_dock/acpi_dock.c +++ b/sys/dev/acpica/acpi_dock/acpi_dock.c @@ -39,7 +39,7 @@ #include #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_DOCK ACPI_MODULE_NAME("DOCK") diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index 587c8f0116..d67146d948 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -43,7 +43,7 @@ #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_EC ACPI_MODULE_NAME("EC") diff --git a/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c b/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c index ac3c7ce597..114b85bc9a 100644 --- a/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c +++ b/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c @@ -40,7 +40,7 @@ #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("Fujitsu") diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index 8c26f529a2..993171db1d 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -40,7 +40,7 @@ #include "acpivar.h" #include "acpi_hpet.h" -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_TIMER ACPI_MODULE_NAME("HPET") diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c index d1f90bcd7c..748e1a7c54 100644 --- a/sys/dev/acpica/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -44,7 +44,7 @@ #include #include -/* Hooks for the ACPI CA debugging infrastructure. */ +/* Hooks for the ACPICA debugging infrastructure. */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("ISA_ACPI") diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c index a29114ca4d..df6cfa04b1 100644 --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -41,7 +41,7 @@ #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_BUTTON ACPI_MODULE_NAME("LID") diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index f32fc08a47..56239ec89b 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -46,7 +46,7 @@ #include "pcib_if.h" #include "pci_if.h" -/* Hooks for the ACPI CA debugging infrastructure. */ +/* Hooks for the ACPICA debugging infrastructure. */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("PCI") @@ -215,7 +215,7 @@ acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child) /* * The TabletPC TC1000 has a second PCI-ISA bridge * that has a _HID for an acpi_sysresource device. - * In that case, leave ACPI-CA's device data pointing + * In that case, leave ACPICA's device data pointing * at the ACPI-enumerated device. */ device_printf(child, @@ -232,7 +232,7 @@ acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child) } /* - * Update ACPI-CA to use the PCI enumerated device_t for this handle. + * Update ACPICA to use the PCI enumerated device_t for this handle. */ status = AcpiDetachData(handle, acpi_fake_objhandler); if (ACPI_FAILURE(status)) diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index f9197ee578..fa9de32e55 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -44,7 +44,7 @@ #include #include "pcib_if.h" -/* Hooks for the ACPI CA debugging infrastructure. */ +/* Hooks for the ACPICA debugging infrastructure. */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("PCI_LINK") diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index abf6372bf6..64051e092c 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -44,7 +44,7 @@ #include #include "pcib_if.h" -/* Hooks for the ACPI CA debugging infrastructure. */ +/* Hooks for the ACPICA debugging infrastructure. */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("PCI") diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 359c526392..51de1d26da 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -46,7 +46,7 @@ #include -/* Hooks for the ACPI CA debugging infrastructure. */ +/* Hooks for the ACPICA debugging infrastructure. */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("PCI_ACPI") diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c index 048416e2d9..d9159ab0f9 100644 --- a/sys/dev/acpica/acpi_pcib_pci.c +++ b/sys/dev/acpica/acpi_pcib_pci.c @@ -45,7 +45,7 @@ #include #include "pcib_if.h" -/* Hooks for the ACPI CA debugging infrastructure. */ +/* Hooks for the ACPICA debugging infrastructure. */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("PCI_PCI") diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c index b4569f430e..d00f5bb495 100644 --- a/sys/dev/acpica/acpi_powerres.c +++ b/sys/dev/acpica/acpi_powerres.c @@ -54,7 +54,7 @@ MALLOC_DEFINE(M_ACPIPWR, "acpipwr", "ACPI power resources"); -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_POWERRES ACPI_MODULE_NAME("POWERRES") diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index fb483e4658..8fa59c16cc 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -42,7 +42,7 @@ #include "acpi.h" #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("RESOURCE") diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c index 8308517b5b..d125e06ac1 100644 --- a/sys/dev/acpica/acpi_thermal.c +++ b/sys/dev/acpica/acpi_thermal.c @@ -48,7 +48,7 @@ #include -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_THERMAL ACPI_MODULE_NAME("THERMAL") diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 5db00dc3db..c17543fb94 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -48,7 +48,7 @@ * Based on the i386-only mp_clock.c by . */ -/* Hooks for the ACPI CA debugging infrastructure */ +/* Hooks for the ACPICA debugging infrastructure */ #define _COMPONENT ACPI_TIMER ACPI_MODULE_NAME("TIMER") diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 1851300af1..8c145bb4f0 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -148,7 +148,7 @@ struct acpi_prw_data { * interrupts, get/set control paths, etc.) should use the sx lock macros * (ACPI_SERIAL). * - * ACPI-CA handles its own locking and should not be called with locks held. + * ACPICA handles its own locking and should not be called with locks held. * * The most complicated path is: * GPE -> EC runs _Qxx -> _Qxx reads EC space -> GPE @@ -169,7 +169,7 @@ extern struct lock acpi_lock; #define ACPI_SERIAL_ASSERT(sys) KKASSERT(lockstatus(&sys##_serial, curthread) == LK_EXCLUSIVE); #define ACPI_SERIAL_DECL(sys, name) static struct lock sys##_serial; /* - * ACPI CA does not define layers for non-ACPI CA drivers. + * ACPICA does not define layers for non-ACPICA drivers. * We define some here within the range provided. */ #define ACPI_AC_ADAPTER 0x00010000 diff --git a/sys/platform/pc32/apic/lapic.c b/sys/platform/pc32/apic/lapic.c index 754db2b25a..6676765641 100644 --- a/sys/platform/pc32/apic/lapic.c +++ b/sys/platform/pc32/apic/lapic.c @@ -437,9 +437,9 @@ lapic_timer_restart_handler(void *dummy __unused) } /* - * This function is called only by ACPI-CA code currently: + * This function is called only by ACPICA code currently: * - AMD C1E fixup. AMD C1E only seems to happen after ACPI - * module controls PM. So once ACPI-CA is attached, we try + * module controls PM. So once ACPICA is attached, we try * to apply the fixup to prevent LAPIC timer from hanging. */ static void diff --git a/sys/platform/pc64/apic/lapic.c b/sys/platform/pc64/apic/lapic.c index f39396d6f0..7c28094188 100644 --- a/sys/platform/pc64/apic/lapic.c +++ b/sys/platform/pc64/apic/lapic.c @@ -504,9 +504,9 @@ lapic_timer_restart_handler(void *dummy __unused) } /* - * This function is called only by ACPI-CA code currently: + * This function is called only by ACPICA code currently: * - AMD C1E fixup. AMD C1E only seems to happen after ACPI - * module controls PM. So once ACPI-CA is attached, we try + * module controls PM. So once ACPICA is attached, we try * to apply the fixup to prevent LAPIC timer from hanging. */ static void