Skip to content

L
linux
Commit 50df4d8b authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files
Options

ACPICA: Restructure includes into public/private 

acpi.h now includes only the "public" acpica headers. All other
acpica headers are "private" and should not be included by acpica
users. One new file, accommon.h is used to include the commonly
used private headers for acpica code generation. Future plans
are to move all private headers to a new subdirectory.
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ea7e96e0
Show whitespace changes
Inline Side-by-side
Showing with 980 additions and 673 deletions
drivers/acpi/dispatcher/dsfield.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/dispatcher/dsinit.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/dispatcher/dsmethod.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/dispatcher/dsmthdat.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/dispatcher/dsobject.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
......
drivers/acpi/dispatcher/dsopcode.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
......
drivers/acpi/dispatcher/dsutils.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
......
drivers/acpi/dispatcher/dswexec.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
......
drivers/acpi/dispatcher/dswload.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
......
drivers/acpi/dispatcher/dswscope.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#define _COMPONENT ACPI_DISPATCHER #define _COMPONENT ACPI_DISPATCHER
......
drivers/acpi/dispatcher/dswstate.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/events/evevent.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#define _COMPONENT ACPI_EVENTS #define _COMPONENT ACPI_EVENTS
......
drivers/acpi/events/evgpe.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/events/evgpeblk.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/events/evmisc.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/events/evregion.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/events/evrgnini.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/events/evsci.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#define _COMPONENT ACPI_EVENTS #define _COMPONENT ACPI_EVENTS
......
drivers/acpi/events/evxface.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/events/evxfevnt.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/events/evxfregn.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
......
drivers/acpi/executer/exconfig.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/executer/exconvrt.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/executer/excreate.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/executer/exdump.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/executer/exfield.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/executer/exfldio.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
......
drivers/acpi/executer/exmisc.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/amlresrc.h> #include <acpi/amlresrc.h>
......
drivers/acpi/executer/exmutex.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
......
drivers/acpi/executer/exnames.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/executer/exoparg1.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/executer/exoparg2.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
......
drivers/acpi/executer/exoparg3.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/executer/exoparg6.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/executer/exprep.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/executer/exregion.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#define _COMPONENT ACPI_EXECUTER #define _COMPONENT ACPI_EXECUTER
......
drivers/acpi/executer/exresnte.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/executer/exresolv.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/executer/exresop.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/executer/exstore.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/executer/exstoren.c
View file @ 50df4d8b
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/executer/exstorob.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#define _COMPONENT ACPI_EXECUTER #define _COMPONENT ACPI_EXECUTER
......
drivers/acpi/executer/exsystem.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#define _COMPONENT ACPI_EXECUTER #define _COMPONENT ACPI_EXECUTER
......
drivers/acpi/executer/exutils.c
View file @ 50df4d8b
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#define DEFINE_AML_GLOBALS #define DEFINE_AML_GLOBALS
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/hardware/hwacpi.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#define _COMPONENT ACPI_HARDWARE #define _COMPONENT ACPI_HARDWARE
ACPI_MODULE_NAME("hwacpi") ACPI_MODULE_NAME("hwacpi")
......
drivers/acpi/hardware/hwgpe.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#define _COMPONENT ACPI_HARDWARE #define _COMPONENT ACPI_HARDWARE
......
drivers/acpi/hardware/hwregs.c
View file @ 50df4d8b
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
......
drivers/acpi/hardware/hwsleep.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/actables.h> #include <acpi/actables.h>
#define _COMPONENT ACPI_HARDWARE #define _COMPONENT ACPI_HARDWARE
......
drivers/acpi/hardware/hwtimer.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#define _COMPONENT ACPI_HARDWARE #define _COMPONENT ACPI_HARDWARE
ACPI_MODULE_NAME("hwtimer") ACPI_MODULE_NAME("hwtimer")
......
drivers/acpi/hardware/hwxface.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_HARDWARE #define _COMPONENT ACPI_HARDWARE
......
drivers/acpi/namespace/nsaccess.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
......
drivers/acpi/namespace/nsalloc.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
......
drivers/acpi/namespace/nsdump.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
......
drivers/acpi/namespace/nsdumpdv.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
/* TBD: This entire module is apparently obsolete and should be removed */ /* TBD: This entire module is apparently obsolete and should be removed */
......
drivers/acpi/namespace/nseval.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/namespace/nsinit.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/namespace/nsload.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/namespace/nsnames.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/namespace/nsobject.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
......
drivers/acpi/namespace/nsparse.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
......
drivers/acpi/namespace/nspredef.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acpredef.h> #include <acpi/acpredef.h>
......
drivers/acpi/namespace/nssearch.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
......
drivers/acpi/namespace/nsutils.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/namespace/nswalk.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
......
drivers/acpi/namespace/nsxfeval.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/namespace/nsxfname.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
......
drivers/acpi/namespace/nsxfobj.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
......
drivers/acpi/parser/psargs.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/parser/psloop.c
View file @ 50df4d8b
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/parser/psopcode.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acopcode.h> #include <acpi/acopcode.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/parser/psparse.c
View file @ 50df4d8b
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/parser/psscope.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#define _COMPONENT ACPI_PARSER #define _COMPONENT ACPI_PARSER
......
drivers/acpi/parser/pstree.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/parser/psutils.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/amlcode.h> #include <acpi/amlcode.h>
......
drivers/acpi/parser/pswalk.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#define _COMPONENT ACPI_PARSER #define _COMPONENT ACPI_PARSER
......
drivers/acpi/parser/psxface.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acparser.h> #include <acpi/acparser.h>
#include <acpi/acdispat.h> #include <acpi/acdispat.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/resources/rsaddr.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rscalc.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/resources/rscreate.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/resources/rsdump.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rsinfo.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rsio.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rsirq.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rslist.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rsmemory.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rsmisc.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#define _COMPONENT ACPI_RESOURCES #define _COMPONENT ACPI_RESOURCES
......
drivers/acpi/resources/rsutils.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
......
drivers/acpi/resources/rsxface.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acresrc.h> #include <acpi/acresrc.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/tables/tbfadt.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/actables.h> #include <acpi/actables.h>
#define _COMPONENT ACPI_TABLES #define _COMPONENT ACPI_TABLES
......
drivers/acpi/tables/tbfind.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/actables.h> #include <acpi/actables.h>
#define _COMPONENT ACPI_TABLES #define _COMPONENT ACPI_TABLES
......
drivers/acpi/tables/tbinstal.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/tables/tbutils.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/actables.h> #include <acpi/actables.h>
#define _COMPONENT ACPI_TABLES #define _COMPONENT ACPI_TABLES
......
drivers/acpi/tables/tbxface.c
View file @ 50df4d8b
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/tables/tbxfroot.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/actables.h> #include <acpi/actables.h>
#define _COMPONENT ACPI_TABLES #define _COMPONENT ACPI_TABLES
......
drivers/acpi/utilities/utalloc.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acdebug.h> #include <acpi/acdebug.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
......
drivers/acpi/utilities/utcache.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME("utcache") ACPI_MODULE_NAME("utcache")
......
drivers/acpi/utilities/utcopy.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
......
drivers/acpi/utilities/utdebug.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME("utdebug") ACPI_MODULE_NAME("utdebug")
...@@ -136,7 +137,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name) ...@@ -136,7 +137,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_ut_debug_print * FUNCTION: acpi_debug_print
* *
* PARAMETERS: requested_debug_level - Requested debug print level * PARAMETERS: requested_debug_level - Requested debug print level
* line_number - Caller's line number (for error output) * line_number - Caller's line number (for error output)
...@@ -154,7 +155,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name) ...@@ -154,7 +155,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
******************************************************************************/ ******************************************************************************/
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_ut_debug_print(u32 requested_debug_level, acpi_debug_print(u32 requested_debug_level,
u32 line_number, u32 line_number,
const char *function_name, const char *function_name,
const char *module_name, const char *module_name,
...@@ -205,11 +206,11 @@ acpi_ut_debug_print(u32 requested_debug_level, ...@@ -205,11 +206,11 @@ acpi_ut_debug_print(u32 requested_debug_level,
va_end(args); va_end(args);
} }
ACPI_EXPORT_SYMBOL(acpi_ut_debug_print) ACPI_EXPORT_SYMBOL(acpi_debug_print)
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_ut_debug_print_raw * FUNCTION: acpi_debug_print_raw
* *
* PARAMETERS: requested_debug_level - Requested debug print level * PARAMETERS: requested_debug_level - Requested debug print level
* line_number - Caller's line number * line_number - Caller's line number
...@@ -226,7 +227,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_debug_print) ...@@ -226,7 +227,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_debug_print)
* *
******************************************************************************/ ******************************************************************************/
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_ut_debug_print_raw(u32 requested_debug_level, acpi_debug_print_raw(u32 requested_debug_level,
u32 line_number, u32 line_number,
const char *function_name, const char *function_name,
const char *module_name, const char *module_name,
...@@ -244,7 +245,7 @@ acpi_ut_debug_print_raw(u32 requested_debug_level, ...@@ -244,7 +245,7 @@ acpi_ut_debug_print_raw(u32 requested_debug_level,
va_end(args); va_end(args);
} }
ACPI_EXPORT_SYMBOL(acpi_ut_debug_print_raw) ACPI_EXPORT_SYMBOL(acpi_debug_print_raw)
/******************************************************************************* /*******************************************************************************
* *
...@@ -270,9 +271,9 @@ acpi_ut_trace(u32 line_number, ...@@ -270,9 +271,9 @@ acpi_ut_trace(u32 line_number,
acpi_gbl_nesting_level++; acpi_gbl_nesting_level++;
acpi_ut_track_stack_ptr(); acpi_ut_track_stack_ptr();
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name, component_id,
component_id, "%s\n", acpi_gbl_fn_entry_str); "%s\n", acpi_gbl_fn_entry_str);
} }
ACPI_EXPORT_SYMBOL(acpi_ut_trace) ACPI_EXPORT_SYMBOL(acpi_ut_trace)
...@@ -301,10 +302,9 @@ acpi_ut_trace_ptr(u32 line_number, ...@@ -301,10 +302,9 @@ acpi_ut_trace_ptr(u32 line_number,
acpi_gbl_nesting_level++; acpi_gbl_nesting_level++;
acpi_ut_track_stack_ptr(); acpi_ut_track_stack_ptr();
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name, component_id,
component_id, "%s %p\n", acpi_gbl_fn_entry_str, "%s %p\n", acpi_gbl_fn_entry_str, pointer);
pointer);
} }
/******************************************************************************* /*******************************************************************************
...@@ -333,10 +333,9 @@ acpi_ut_trace_str(u32 line_number, ...@@ -333,10 +333,9 @@ acpi_ut_trace_str(u32 line_number,
acpi_gbl_nesting_level++; acpi_gbl_nesting_level++;
acpi_ut_track_stack_ptr(); acpi_ut_track_stack_ptr();
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name, component_id,
component_id, "%s %s\n", acpi_gbl_fn_entry_str, "%s %s\n", acpi_gbl_fn_entry_str, string);
string);
} }
/******************************************************************************* /*******************************************************************************
...@@ -365,10 +364,9 @@ acpi_ut_trace_u32(u32 line_number, ...@@ -365,10 +364,9 @@ acpi_ut_trace_u32(u32 line_number,
acpi_gbl_nesting_level++; acpi_gbl_nesting_level++;
acpi_ut_track_stack_ptr(); acpi_ut_track_stack_ptr();
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name, component_id,
component_id, "%s %08X\n", acpi_gbl_fn_entry_str, "%s %08X\n", acpi_gbl_fn_entry_str, integer);
integer);
} }
/******************************************************************************* /*******************************************************************************
...@@ -393,9 +391,9 @@ acpi_ut_exit(u32 line_number, ...@@ -393,9 +391,9 @@ acpi_ut_exit(u32 line_number,
const char *module_name, u32 component_id) const char *module_name, u32 component_id)
{ {
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name, component_id,
component_id, "%s\n", acpi_gbl_fn_exit_str); "%s\n", acpi_gbl_fn_exit_str);
acpi_gbl_nesting_level--; acpi_gbl_nesting_level--;
} }
...@@ -426,13 +424,12 @@ acpi_ut_status_exit(u32 line_number, ...@@ -426,13 +424,12 @@ acpi_ut_status_exit(u32 line_number,
{ {
if (ACPI_SUCCESS(status)) { if (ACPI_SUCCESS(status)) {
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name,
component_id, "%s %s\n", component_id, "%s %s\n", acpi_gbl_fn_exit_str,
acpi_gbl_fn_exit_str,
acpi_format_exception(status)); acpi_format_exception(status));
} else { } else {
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name,
component_id, "%s ****Exception****: %s\n", component_id, "%s ****Exception****: %s\n",
acpi_gbl_fn_exit_str, acpi_gbl_fn_exit_str,
...@@ -467,10 +464,10 @@ acpi_ut_value_exit(u32 line_number, ...@@ -467,10 +464,10 @@ acpi_ut_value_exit(u32 line_number,
u32 component_id, acpi_integer value) u32 component_id, acpi_integer value)
{ {
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name, component_id,
component_id, "%s %8.8X%8.8X\n", "%s %8.8X%8.8X\n", acpi_gbl_fn_exit_str,
acpi_gbl_fn_exit_str, ACPI_FORMAT_UINT64(value)); ACPI_FORMAT_UINT64(value));
acpi_gbl_nesting_level--; acpi_gbl_nesting_level--;
} }
...@@ -499,9 +496,9 @@ acpi_ut_ptr_exit(u32 line_number, ...@@ -499,9 +496,9 @@ acpi_ut_ptr_exit(u32 line_number,
const char *module_name, u32 component_id, u8 *ptr) const char *module_name, u32 component_id, u8 *ptr)
{ {
acpi_ut_debug_print(ACPI_LV_FUNCTIONS, acpi_debug_print(ACPI_LV_FUNCTIONS,
line_number, function_name, module_name, line_number, function_name, module_name, component_id,
component_id, "%s %p\n", acpi_gbl_fn_exit_str, ptr); "%s %p\n", acpi_gbl_fn_exit_str, ptr);
acpi_gbl_nesting_level--; acpi_gbl_nesting_level--;
} }
......
drivers/acpi/utilities/utdelete.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
......
drivers/acpi/utilities/uteval.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acinterp.h> #include <acpi/acinterp.h>
......
drivers/acpi/utilities/utglobal.c
View file @ 50df4d8b
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#define DEFINE_ACPI_GLOBALS #define DEFINE_ACPI_GLOBALS
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
......
drivers/acpi/utilities/utinit.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/actables.h> #include <acpi/actables.h>
......
drivers/acpi/utilities/utmath.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME("utmath") ACPI_MODULE_NAME("utmath")
......
drivers/acpi/utilities/utmisc.c
View file @ 50df4d8b
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
...@@ -1016,7 +1017,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object, ...@@ -1016,7 +1017,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_ut_error, acpi_ut_warning, acpi_ut_info * FUNCTION: acpi_error, acpi_exception, acpi_warning, acpi_info
* *
* PARAMETERS: module_name - Caller's module name (for error output) * PARAMETERS: module_name - Caller's module name (for error output)
* line_number - Caller's line number (for error output) * line_number - Caller's line number (for error output)
...@@ -1029,7 +1030,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object, ...@@ -1029,7 +1030,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
******************************************************************************/ ******************************************************************************/
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...) acpi_error(const char *module_name, u32 line_number, const char *format, ...)
{ {
va_list args; va_list args;
...@@ -1042,7 +1043,7 @@ acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...) ...@@ -1042,7 +1043,7 @@ acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...)
} }
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_ut_exception(const char *module_name, acpi_exception(const char *module_name,
u32 line_number, acpi_status status, const char *format, ...) u32 line_number, acpi_status status, const char *format, ...)
{ {
va_list args; va_list args;
...@@ -1056,11 +1057,8 @@ acpi_ut_exception(const char *module_name, ...@@ -1056,11 +1057,8 @@ acpi_ut_exception(const char *module_name,
va_end(args); va_end(args);
} }
EXPORT_SYMBOL(acpi_ut_exception);
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_ut_warning(const char *module_name, acpi_warning(const char *module_name, u32 line_number, const char *format, ...)
u32 line_number, const char *format, ...)
{ {
va_list args; va_list args;
...@@ -1073,7 +1071,7 @@ acpi_ut_warning(const char *module_name, ...@@ -1073,7 +1071,7 @@ acpi_ut_warning(const char *module_name,
} }
void ACPI_INTERNAL_VAR_XFACE void ACPI_INTERNAL_VAR_XFACE
acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...) acpi_info(const char *module_name, u32 line_number, const char *format, ...)
{ {
va_list args; va_list args;
...@@ -1088,3 +1086,8 @@ acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...) ...@@ -1088,3 +1086,8 @@ acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...)
acpi_os_printf("\n"); acpi_os_printf("\n");
va_end(args); va_end(args);
} }
ACPI_EXPORT_SYMBOL(acpi_error)
ACPI_EXPORT_SYMBOL(acpi_exception)
ACPI_EXPORT_SYMBOL(acpi_warning)
ACPI_EXPORT_SYMBOL(acpi_info)
drivers/acpi/utilities/utmutex.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME("utmutex") ACPI_MODULE_NAME("utmutex")
......
drivers/acpi/utilities/utobject.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
......
drivers/acpi/utilities/utresrc.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/amlresrc.h> #include <acpi/amlresrc.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
......
drivers/acpi/utilities/utstate.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#define _COMPONENT ACPI_UTILITIES #define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME("utstate") ACPI_MODULE_NAME("utstate")
......
drivers/acpi/utilities/utxface.c
View file @ 50df4d8b
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/accommon.h>
#include <acpi/acevents.h> #include <acpi/acevents.h>
#include <acpi/acnamesp.h> #include <acpi/acnamesp.h>
#include <acpi/acdebug.h> #include <acpi/acdebug.h>
......
include/acpi/accommon.h 0 → 100644
View file @ 50df4d8b
/******************************************************************************
*
* Name: accommon.h - Common include files for generation of ACPICA source
*
*****************************************************************************/
/*
* Copyright (C) 2000 - 2008, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions, and the following disclaimer,
* without modification.
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
* substantially similar to the "NO WARRANTY" disclaimer below
* ("Disclaimer") and any redistribution must be conditioned upon
* including a substantially similar Disclaimer requirement for further
* binary redistribution.
* 3. Neither the names of the above-listed copyright holders nor the names
* of any contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* Alternatively, this software may be distributed under the terms of the
* GNU General Public License ("GPL") version 2 as published by the Free
* Software Foundation.
*
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*/
#ifndef __ACCOMMON_H__
#define __ACCOMMON_H__
/*
* Common set of includes for all ACPICA source files.
* We put them here because we don't want to duplicate them
* in the the source code again and again.
*
* Note: The order of these include files is important.
*/
#include "acconfig.h" /* Global configuration constants */
#include "acmacros.h" /* C macros */
#include "aclocal.h" /* Internal data types */
#include "acobject.h" /* ACPI internal object */
#include "acstruct.h" /* Common structures */
#include "acglobal.h" /* All global variables */
#include "achware.h" /* Hardware defines and interfaces */
#include "acutils.h" /* Utility interfaces */
#endif /* __ACCOMMON_H__ */
include/acpi/acconfig.h
View file @ 50df4d8b
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
* *
*/ */
/* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20081031
/* /*
* OS name, used for the _OS object. The _OS object is essentially obsolete, * OS name, used for the _OS object. The _OS object is essentially obsolete,
* but there is a large base of ASL/AML code in existing machines that check * but there is a large base of ASL/AML code in existing machines that check
......
include/acpi/acexcep.h
View file @ 50df4d8b
...@@ -176,6 +176,8 @@ ...@@ -176,6 +176,8 @@
#define AE_CODE_CTRL_MAX 0x000D #define AE_CODE_CTRL_MAX 0x000D
/* Exception strings for acpi_format_exception */
#ifdef DEFINE_ACPI_GLOBALS #ifdef DEFINE_ACPI_GLOBALS
/* /*
......
include/acpi/achware.h
View file @ 50df4d8b
...@@ -44,11 +44,7 @@ ...@@ -44,11 +44,7 @@
#ifndef __ACHWARE_H__ #ifndef __ACHWARE_H__
#define __ACHWARE_H__ #define __ACHWARE_H__
/* PM Timer ticks per second (HZ) */ /* Values for the _SST predefined method */
#define PM_TIMER_FREQUENCY 3579545
/* Values for the _SST reserved method */
#define ACPI_SST_INDICATOR_OFF 0 #define ACPI_SST_INDICATOR_OFF 0
#define ACPI_SST_WORKING 1 #define ACPI_SST_WORKING 1
...@@ -56,8 +52,6 @@ ...@@ -56,8 +52,6 @@
#define ACPI_SST_SLEEPING 3 #define ACPI_SST_SLEEPING 3
#define ACPI_SST_SLEEP_CONTEXT 4 #define ACPI_SST_SLEEP_CONTEXT 4
/* Prototypes */
/* /*
* hwacpi - high level functions * hwacpi - high level functions
*/ */
......
include/acpi/aclocal.h
View file @ 50df4d8b
...@@ -46,8 +46,6 @@ ...@@ -46,8 +46,6 @@
/* acpisrc:struct_defs -- for acpisrc conversion */ /* acpisrc:struct_defs -- for acpisrc conversion */
#define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */
#define ACPI_DO_NOT_WAIT 0
#define ACPI_SERIALIZED 0xFF #define ACPI_SERIALIZED 0xFF
typedef u32 acpi_mutex_handle; typedef u32 acpi_mutex_handle;
...@@ -120,11 +118,6 @@ static char *acpi_gbl_mutex_names[ACPI_NUM_MUTEX] = { ...@@ -120,11 +118,6 @@ static char *acpi_gbl_mutex_names[ACPI_NUM_MUTEX] = {
#define ACPI_MAX_LOCK 1 #define ACPI_MAX_LOCK 1
#define ACPI_NUM_LOCK ACPI_MAX_LOCK+1 #define ACPI_NUM_LOCK ACPI_MAX_LOCK+1
/* Owner IDs are used to track namespace nodes for selective deletion */
typedef u8 acpi_owner_id;
#define ACPI_OWNER_ID_MAX 0xFF
/* This Thread ID means that the mutex is not in use (unlocked) */ /* This Thread ID means that the mutex is not in use (unlocked) */
#define ACPI_MUTEX_NOT_ACQUIRED (acpi_thread_id) 0 #define ACPI_MUTEX_NOT_ACQUIRED (acpi_thread_id) 0
...@@ -165,11 +158,6 @@ typedef enum { ...@@ -165,11 +158,6 @@ typedef enum {
ACPI_IMODE_EXECUTE = 0x03 ACPI_IMODE_EXECUTE = 0x03
} acpi_interpreter_mode; } acpi_interpreter_mode;
union acpi_name_union {
u32 integer;
char ascii[4];
};
/* /*
* The Namespace Node describes a named object that appears in the AML. * The Namespace Node describes a named object that appears in the AML.
* descriptor_type is used to differentiate between internal descriptors. * descriptor_type is used to differentiate between internal descriptors.
...@@ -216,26 +204,6 @@ struct acpi_namespace_node { ...@@ -216,26 +204,6 @@ struct acpi_namespace_node {
#define ANOBJ_IS_BIT_OFFSET 0x40 /* i_aSL only: Reference is a bit offset */ #define ANOBJ_IS_BIT_OFFSET 0x40 /* i_aSL only: Reference is a bit offset */
#define ANOBJ_IS_REFERENCED 0x80 /* i_aSL only: Object was referenced */ #define ANOBJ_IS_REFERENCED 0x80 /* i_aSL only: Object was referenced */
/*
* ACPI Table Descriptor. One per ACPI table
*/
struct acpi_table_desc {
acpi_physical_address address;
struct acpi_table_header *pointer;
u32 length; /* Length fixed at 32 bits */
union acpi_name_union signature;
acpi_owner_id owner_id;
u8 flags;
};
/* Flags for above */
#define ACPI_TABLE_ORIGIN_UNKNOWN (0)
#define ACPI_TABLE_ORIGIN_MAPPED (1)
#define ACPI_TABLE_ORIGIN_ALLOCATED (2)
#define ACPI_TABLE_ORIGIN_MASK (3)
#define ACPI_TABLE_IS_LOADED (4)
/* One internal RSDT for table management */ /* One internal RSDT for table management */
struct acpi_internal_rsdt { struct acpi_internal_rsdt {
...@@ -266,15 +234,6 @@ struct acpi_ns_search_data { ...@@ -266,15 +234,6 @@ struct acpi_ns_search_data {
struct acpi_namespace_node *node; struct acpi_namespace_node *node;
}; };
/*
* Predefined Namespace items
*/
struct acpi_predefined_names {
char *name;
u8 type;
char *val;
};
/* Object types used during package copies */ /* Object types used during package copies */
#define ACPI_COPY_TYPE_SIMPLE 0 #define ACPI_COPY_TYPE_SIMPLE 0
...@@ -677,6 +636,12 @@ union acpi_parse_value { ...@@ -677,6 +636,12 @@ union acpi_parse_value {
union acpi_parse_object *arg; /* arguments and contained ops */ union acpi_parse_object *arg; /* arguments and contained ops */
}; };
#ifdef ACPI_DISASSEMBLER
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#else
#define ACPI_DISASM_ONLY_MEMBERS(a)
#endif
#define ACPI_PARSE_COMMON \ #define ACPI_PARSE_COMMON \
union acpi_parse_object *parent; /* Parent op */\ union acpi_parse_object *parent; /* Parent op */\
u8 descriptor_type; /* To differentiate various internal objs */\ u8 descriptor_type; /* To differentiate various internal objs */\
...@@ -796,9 +761,6 @@ struct acpi_parse_state { ...@@ -796,9 +761,6 @@ struct acpi_parse_state {
* *
****************************************************************************/ ****************************************************************************/
#define PCI_ROOT_HID_STRING "PNP0A03"
#define PCI_EXPRESS_ROOT_HID_STRING "PNP0A08"
struct acpi_bit_register_info { struct acpi_bit_register_info {
u8 parent_register; u8 parent_register;
u8 bit_position; u8 bit_position;
...@@ -1025,26 +987,4 @@ struct acpi_debug_mem_block { ...@@ -1025,26 +987,4 @@ struct acpi_debug_mem_block {
#define ACPI_MEM_LIST_MAX 1 #define ACPI_MEM_LIST_MAX 1
#define ACPI_NUM_MEM_LISTS 2 #define ACPI_NUM_MEM_LISTS 2
struct acpi_memory_list {
char *list_name;
void *list_head;
u16 object_size;
u16 max_depth;
u16 current_depth;
u16 link_offset;
#ifdef ACPI_DBG_TRACK_ALLOCATIONS
/* Statistics for debug memory tracking only */
u32 total_allocated;
u32 total_freed;
u32 max_occupied;
u32 total_size;
u32 current_total_size;
u32 requests;
u32 hits;
#endif
};
#endif /* __ACLOCAL_H__ */ #endif /* __ACLOCAL_H__ */
include/acpi/acmacros.h
View file @ 50df4d8b
...@@ -44,23 +44,6 @@ ...@@ -44,23 +44,6 @@
#ifndef __ACMACROS_H__ #ifndef __ACMACROS_H__
#define __ACMACROS_H__ #define __ACMACROS_H__
/*
* Data manipulation macros
*/
#define ACPI_LOWORD(l) ((u16)(u32)(l))
#define ACPI_HIWORD(l) ((u16)((((u32)(l)) >> 16) & 0xFFFF))
#define ACPI_LOBYTE(l) ((u8)(u16)(l))
#define ACPI_HIBYTE(l) ((u8)((((u16)(l)) >> 8) & 0xFF))
#define ACPI_SET_BIT(target,bit) ((target) |= (bit))
#define ACPI_CLEAR_BIT(target,bit) ((target) &= ~(bit))
#define ACPI_MIN(a,b) (((a)<(b))?(a):(b))
#define ACPI_MAX(a,b) (((a)>(b))?(a):(b))
/* Size calculation */
#define ACPI_ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
/* /*
* Extract data using a pointer. Any more than a byte and we * Extract data using a pointer. Any more than a byte and we
* get into potential aligment issues -- see the STORE macros below. * get into potential aligment issues -- see the STORE macros below.
...@@ -75,39 +58,6 @@ ...@@ -75,39 +58,6 @@
#define ACPI_SET32(ptr) *ACPI_CAST_PTR (u32, ptr) #define ACPI_SET32(ptr) *ACPI_CAST_PTR (u32, ptr)
#define ACPI_SET64(ptr) *ACPI_CAST_PTR (u64, ptr) #define ACPI_SET64(ptr) *ACPI_CAST_PTR (u64, ptr)
/*
* Pointer manipulation
*/
#define ACPI_CAST_PTR(t, p) ((t *) (acpi_uintptr_t) (p))
#define ACPI_CAST_INDIRECT_PTR(t, p) ((t **) (acpi_uintptr_t) (p))
#define ACPI_ADD_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (u8, (a)) + (acpi_size)(b)))
#define ACPI_PTR_DIFF(a, b) (acpi_size) (ACPI_CAST_PTR (u8, (a)) - ACPI_CAST_PTR (u8, (b)))
/* Pointer/Integer type conversions */
#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) NULL, (acpi_size) i)
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) NULL)
#define ACPI_OFFSET(d, f) (acpi_size) ACPI_PTR_DIFF (&(((d *)0)->f), (void *) NULL)
#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)
#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
#define ACPI_COMPARE_NAME(a, b) (*ACPI_CAST_PTR (u32, (a)) == *ACPI_CAST_PTR (u32, (b)))
#else
#define ACPI_COMPARE_NAME(a, b) (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE))
#endif
/*
* Full 64-bit integer must be available on both 32-bit and 64-bit platforms
*/
struct acpi_integer_overlay {
u32 lo_dword;
u32 hi_dword;
};
#define ACPI_LODWORD(integer) (ACPI_CAST_PTR (struct acpi_integer_overlay, &integer)->lo_dword)
#define ACPI_HIDWORD(integer) (ACPI_CAST_PTR (struct acpi_integer_overlay, &integer)->hi_dword)
/* /*
* printf() format helpers * printf() format helpers
*/ */
...@@ -357,12 +307,6 @@ struct acpi_integer_overlay { ...@@ -357,12 +307,6 @@ struct acpi_integer_overlay {
{(u32)(Pargs), (u32)(Iargs), (u32)(flags), obj_type, class, type} {(u32)(Pargs), (u32)(Iargs), (u32)(flags), obj_type, class, type}
#endif #endif
#ifdef ACPI_DISASSEMBLER
#define ACPI_DISASM_ONLY_MEMBERS(a) a;
#else
#define ACPI_DISASM_ONLY_MEMBERS(a)
#endif
#define ARG_TYPE_WIDTH 5 #define ARG_TYPE_WIDTH 5
#define ARG_1(x) ((u32)(x)) #define ARG_1(x) ((u32)(x))
#define ARG_2(x) ((u32)(x) << (1 * ARG_TYPE_WIDTH)) #define ARG_2(x) ((u32)(x) << (1 * ARG_TYPE_WIDTH))
...@@ -388,32 +332,16 @@ struct acpi_integer_overlay { ...@@ -388,32 +332,16 @@ struct acpi_integer_overlay {
#define GET_CURRENT_ARG_TYPE(list) (list & ((u32) 0x1F)) #define GET_CURRENT_ARG_TYPE(list) (list & ((u32) 0x1F))
#define INCREMENT_ARG_LIST(list) (list >>= ((u32) ARG_TYPE_WIDTH)) #define INCREMENT_ARG_LIST(list) (list >>= ((u32) ARG_TYPE_WIDTH))
#if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES)
/*
* Module name is include in both debug and non-debug versions primarily for
* error messages. The __FILE__ macro is not very useful for this, because it
* often includes the entire pathname to the module
*/
#define ACPI_MODULE_NAME(name) static const char ACPI_UNUSED_VAR _acpi_module_name[] = name;
#else
#define ACPI_MODULE_NAME(name)
#endif
/* /*
* Ascii error messages can be configured out * Ascii error messages can be configured out
*/ */
#ifndef ACPI_NO_ERROR_MESSAGES #ifndef ACPI_NO_ERROR_MESSAGES
#define AE_INFO _acpi_module_name, __LINE__
/* /*
* Error reporting. Callers module and line number are inserted by AE_INFO, * Error reporting. Callers module and line number are inserted by AE_INFO,
* the plist contains a set of parens to allow variable-length lists. * the plist contains a set of parens to allow variable-length lists.
* These macros are used for both the debug and non-debug versions of the code. * These macros are used for both the debug and non-debug versions of the code.
*/ */
#define ACPI_INFO(plist) acpi_ut_info plist
#define ACPI_WARNING(plist) acpi_ut_warning plist
#define ACPI_EXCEPTION(plist) acpi_ut_exception plist
#define ACPI_ERROR(plist) acpi_ut_error plist
#define ACPI_ERROR_NAMESPACE(s, e) acpi_ns_report_error (AE_INFO, s, e); #define ACPI_ERROR_NAMESPACE(s, e) acpi_ns_report_error (AE_INFO, s, e);
#define ACPI_ERROR_METHOD(s, n, p, e) acpi_ns_report_method_error (AE_INFO, s, n, p, e); #define ACPI_ERROR_METHOD(s, n, p, e) acpi_ns_report_method_error (AE_INFO, s, n, p, e);
...@@ -421,50 +349,18 @@ struct acpi_integer_overlay { ...@@ -421,50 +349,18 @@ struct acpi_integer_overlay {
/* No error messages */ /* No error messages */
#define ACPI_INFO(plist)
#define ACPI_WARNING(plist)
#define ACPI_EXCEPTION(plist)
#define ACPI_ERROR(plist)
#define ACPI_ERROR_NAMESPACE(s, e) #define ACPI_ERROR_NAMESPACE(s, e)
#define ACPI_ERROR_METHOD(s, n, p, e) #define ACPI_ERROR_METHOD(s, n, p, e)
#endif #endif /* ACPI_NO_ERROR_MESSAGES */
/* /*
* Debug macros that are conditionally compiled * Debug macros that are conditionally compiled
*/ */
#ifdef ACPI_DEBUG_OUTPUT #ifdef ACPI_DEBUG_OUTPUT
/*
* Common parameters used for debug output functions:
* line number, function name, module(file) name, component ID
*/
#define ACPI_DEBUG_PARAMETERS __LINE__, ACPI_GET_FUNCTION_NAME, _acpi_module_name, _COMPONENT
/* /*
* Function entry tracing * Function entry tracing
*/ */
/*
* If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header,
* define it now. This is the case where there the compiler does not support
* a __func__ macro or equivalent.
*/
#ifndef ACPI_GET_FUNCTION_NAME
#define ACPI_GET_FUNCTION_NAME _acpi_function_name
/*
* The Name parameter should be the procedure name as a quoted string.
* The function name is also used by the function exit macros below.
* Note: (const char) is used to be compatible with the debug interfaces
* and macros such as __func__.
*/
#define ACPI_FUNCTION_NAME(name) static const char _acpi_function_name[] = #name;
#else
/* Compiler supports __func__ (or equivalent) -- Ignore this macro */
#define ACPI_FUNCTION_NAME(name)
#endif
#ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE #ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE
#define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \ #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \
...@@ -584,15 +480,6 @@ struct acpi_integer_overlay { ...@@ -584,15 +480,6 @@ struct acpi_integer_overlay {
#define ACPI_DUMP_RESOURCE_LIST(a) acpi_rs_dump_resource_list(a) #define ACPI_DUMP_RESOURCE_LIST(a) acpi_rs_dump_resource_list(a)
#define ACPI_DUMP_BUFFER(a, b) acpi_ut_dump_buffer((u8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT) #define ACPI_DUMP_BUFFER(a, b) acpi_ut_dump_buffer((u8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT)
/*
* Master debug print macros
* Print iff:
* 1) Debug print for the current component is enabled
* 2) Debug error level or trace level for the print statement is enabled
*/
#define ACPI_DEBUG_PRINT(plist) acpi_ut_debug_print plist
#define ACPI_DEBUG_PRINT_RAW(plist) acpi_ut_debug_print_raw plist
#else #else
/* /*
* This is the non-debug case -- make everything go away, * This is the non-debug case -- make everything go away,
...@@ -603,7 +490,6 @@ struct acpi_integer_overlay { ...@@ -603,7 +490,6 @@ struct acpi_integer_overlay {
#define ACPI_DEBUG_DEFINE(a) do { } while(0) #define ACPI_DEBUG_DEFINE(a) do { } while(0)
#define ACPI_DEBUG_ONLY_MEMBERS(a) do { } while(0) #define ACPI_DEBUG_ONLY_MEMBERS(a) do { } while(0)
#define ACPI_FUNCTION_NAME(a) do { } while(0)
#define ACPI_FUNCTION_TRACE(a) do { } while(0) #define ACPI_FUNCTION_TRACE(a) do { } while(0)
#define ACPI_FUNCTION_TRACE_PTR(a, b) do { } while(0) #define ACPI_FUNCTION_TRACE_PTR(a, b) do { } while(0)
#define ACPI_FUNCTION_TRACE_U32(a, b) do { } while(0) #define ACPI_FUNCTION_TRACE_U32(a, b) do { } while(0)
...@@ -619,8 +505,6 @@ struct acpi_integer_overlay { ...@@ -619,8 +505,6 @@ struct acpi_integer_overlay {
#define ACPI_DUMP_PATHNAME(a, b, c, d) do { } while(0) #define ACPI_DUMP_PATHNAME(a, b, c, d) do { } while(0)
#define ACPI_DUMP_RESOURCE_LIST(a) do { } while(0) #define ACPI_DUMP_RESOURCE_LIST(a) do { } while(0)
#define ACPI_DUMP_BUFFER(a, b) do { } while(0) #define ACPI_DUMP_BUFFER(a, b) do { } while(0)
#define ACPI_DEBUG_PRINT(pl) do { } while(0)
#define ACPI_DEBUG_PRINT_RAW(pl) do { } while(0)
#define return_VOID return #define return_VOID return
#define return_ACPI_STATUS(s) return(s) #define return_ACPI_STATUS(s) return(s)
...@@ -629,7 +513,7 @@ struct acpi_integer_overlay { ...@@ -629,7 +513,7 @@ struct acpi_integer_overlay {
#define return_UINT32(s) return(s) #define return_UINT32(s) return(s)
#define return_PTR(s) return(s) #define return_PTR(s) return(s)
#endif #endif /* ACPI_DEBUG_OUTPUT */
/* /*
* Some code only gets executed when the debugger is built in. * Some code only gets executed when the debugger is built in.
......
include/acpi/acoutput.h
View file @ 50df4d8b
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
/* /*
* Debug levels and component IDs. These are used to control the * Debug levels and component IDs. These are used to control the
* granularity of the output of the DEBUG_PRINT macro -- on a per- * granularity of the output of the ACPI_DEBUG_PRINT macro -- on a
* component basis and a per-exception-type basis. * per-component basis and a per-exception-type basis.
*/ */
/* Component IDs are used in the global "DebugLayer" */ /* Component IDs are used in the global "DebugLayer" */
...@@ -69,8 +69,10 @@ ...@@ -69,8 +69,10 @@
#define ACPI_COMPILER 0x00001000 #define ACPI_COMPILER 0x00001000
#define ACPI_TOOLS 0x00002000 #define ACPI_TOOLS 0x00002000
#define ACPI_EXAMPLE 0x00004000
#define ACPI_DRIVER 0x00008000
#define ACPI_ALL_COMPONENTS 0x00003FFF #define ACPI_ALL_COMPONENTS 0x0000FFFF
#define ACPI_COMPONENT_DEFAULT (ACPI_ALL_COMPONENTS) #define ACPI_COMPONENT_DEFAULT (ACPI_ALL_COMPONENTS)
/* Component IDs reserved for ACPI drivers */ /* Component IDs reserved for ACPI drivers */
...@@ -78,7 +80,7 @@ ...@@ -78,7 +80,7 @@
#define ACPI_ALL_DRIVERS 0xFFFF0000 #define ACPI_ALL_DRIVERS 0xFFFF0000
/* /*
* Raw debug output levels, do not use these in the DEBUG_PRINT macros * Raw debug output levels, do not use these in the ACPI_DEBUG_PRINT macros
*/ */
#define ACPI_LV_INIT 0x00000001 #define ACPI_LV_INIT 0x00000001
#define ACPI_LV_DEBUG_OBJECT 0x00000002 #define ACPI_LV_DEBUG_OBJECT 0x00000002
...@@ -176,4 +178,95 @@ ...@@ -176,4 +178,95 @@
#define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT) #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
#define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
#if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES)
/*
* Module name is included in both debug and non-debug versions primarily for
* error messages. The __FILE__ macro is not very useful for this, because it
* often includes the entire pathname to the module
*/
#define ACPI_MODULE_NAME(name) static const char ACPI_UNUSED_VAR _acpi_module_name[] = name;
#else
#define ACPI_MODULE_NAME(name)
#endif
/*
* Ascii error messages can be configured out
*/
#ifndef ACPI_NO_ERROR_MESSAGES
#define AE_INFO _acpi_module_name, __LINE__
/*
* Error reporting. Callers module and line number are inserted by AE_INFO,
* the plist contains a set of parens to allow variable-length lists.
* These macros are used for both the debug and non-debug versions of the code.
*/
#define ACPI_INFO(plist) acpi_info plist
#define ACPI_WARNING(plist) acpi_warning plist
#define ACPI_EXCEPTION(plist) acpi_exception plist
#define ACPI_ERROR(plist) acpi_error plist
#else
/* No error messages */
#define ACPI_INFO(plist)
#define ACPI_WARNING(plist)
#define ACPI_EXCEPTION(plist)
#define ACPI_ERROR(plist)
#endif /* ACPI_NO_ERROR_MESSAGES */
/*
* Debug macros that are conditionally compiled
*/
#ifdef ACPI_DEBUG_OUTPUT
/*
* If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header,
* define it now. This is the case where there the compiler does not support
* a __FUNCTION__ macro or equivalent.
*/
#ifndef ACPI_GET_FUNCTION_NAME
#define ACPI_GET_FUNCTION_NAME _acpi_function_name
/*
* The Name parameter should be the procedure name as a quoted string.
* The function name is also used by the function exit macros below.
* Note: (const char) is used to be compatible with the debug interfaces
* and macros such as __FUNCTION__.
*/
#define ACPI_FUNCTION_NAME(name) static const char _acpi_function_name[] = #name;
#else
/* Compiler supports __FUNCTION__ (or equivalent) -- Ignore this macro */
#define ACPI_FUNCTION_NAME(name)
#endif /* ACPI_GET_FUNCTION_NAME */
/*
* Common parameters used for debug output functions:
* line number, function name, module(file) name, component ID
*/
#define ACPI_DEBUG_PARAMETERS __LINE__, ACPI_GET_FUNCTION_NAME, _acpi_module_name, _COMPONENT
/*
* Master debug print macros
* Print message if and only if:
* 1) Debug print for the current component is enabled
* 2) Debug error level or trace level for the print statement is enabled
*/
#define ACPI_DEBUG_PRINT(plist) acpi_debug_print plist
#define ACPI_DEBUG_PRINT_RAW(plist) acpi_debug_print_raw plist
#else
/*
* This is the non-debug case -- make everything go away,
* leaving no executable debug code!
*/
#define ACPI_FUNCTION_NAME(a)
#define ACPI_DEBUG_PRINT(pl)
#define ACPI_DEBUG_PRINT_RAW(pl)
#endif /* ACPI_DEBUG_OUTPUT */
#endif /* __ACOUTPUT_H__ */ #endif /* __ACOUTPUT_H__ */
include/acpi/acpi.h
View file @ 50df4d8b
/****************************************************************************** /******************************************************************************
* *
* Name: acpi.h - Master include file, Publics and external data. * Name: acpi.h - Master public include file used to interface to ACPICA
* *
*****************************************************************************/ *****************************************************************************/
...@@ -45,25 +45,22 @@ ...@@ -45,25 +45,22 @@
#define __ACPI_H__ #define __ACPI_H__
/* /*
* Common includes for all ACPI driver files * Public include files for use by code that will interface to ACPICA.
* We put them here because we don't want to duplicate them *
* in the rest of the source code again and again. * Information includes the ACPICA data types, names, exceptions, and
* external interface prototypes. Also included are the definitions for
* all ACPI tables (FADT, MADT, etc.)
*
* Note: The order of these include files is important.
*/ */
#include "acnames.h" /* Global ACPI names and strings */ #include "platform/acenv.h" /* Environment-specific items */
#include "acconfig.h" /* Configuration constants */ #include "acnames.h" /* Common ACPI names and strings */
#include "platform/acenv.h" /* Target environment specific items */ #include "actypes.h" /* ACPICA data types and structures */
#include "actypes.h" /* Fundamental common data types */ #include "acexcep.h" /* ACPICA exceptions */
#include "acexcep.h" /* ACPI exception codes */
#include "acmacros.h" /* C macros */
#include "actbl.h" /* ACPI table definitions */ #include "actbl.h" /* ACPI table definitions */
#include "aclocal.h" /* Internal data types */
#include "acoutput.h" /* Error output and Debug macros */ #include "acoutput.h" /* Error output and Debug macros */
#include "acpiosxf.h" /* Interfaces to the ACPI-to-OS layer */ #include "acrestyp.h" /* Resource Descriptor structs */
#include "acpiosxf.h" /* OSL interfaces (ACPICA-to-OS) */
#include "acpixf.h" /* ACPI core subsystem external interfaces */ #include "acpixf.h" /* ACPI core subsystem external interfaces */
#include "acobject.h" /* ACPI internal object */
#include "acstruct.h" /* Common structures */
#include "acglobal.h" /* All global variables */
#include "achware.h" /* Hardware defines and interfaces */
#include "acutils.h" /* Utility interfaces */
#endif /* __ACPI_H__ */ #endif /* __ACPI_H__ */
include/acpi/acpixf.h
View file @ 50df4d8b
...@@ -45,11 +45,31 @@ ...@@ -45,11 +45,31 @@
#ifndef __ACXFACE_H__ #ifndef __ACXFACE_H__
#define __ACXFACE_H__ #define __ACXFACE_H__
/* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20081031
#include "actypes.h" #include "actypes.h"
#include "actbl.h" #include "actbl.h"
extern u8 acpi_gbl_permanent_mmap; extern u8 acpi_gbl_permanent_mmap;
/*
* Globals that are publically available, allowing for
* run time configuration
*/
extern u32 acpi_dbg_level;
extern u32 acpi_dbg_layer;
extern u8 acpi_gbl_enable_interpreter_slack;
extern u8 acpi_gbl_all_methods_serialized;
extern u8 acpi_gbl_create_osi_method;
extern u8 acpi_gbl_leave_wake_gpes_disabled;
extern acpi_name acpi_gbl_trace_method_name;
extern u32 acpi_gbl_trace_flags;
extern u32 acpi_current_gpe_count;
extern struct acpi_table_fadt acpi_gbl_FADT;
/* /*
* Global interfaces * Global interfaces
*/ */
...@@ -353,4 +373,42 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state); ...@@ -353,4 +373,42 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state);
acpi_status acpi_leave_sleep_state(u8 sleep_state); acpi_status acpi_leave_sleep_state(u8 sleep_state);
/*
* Debug output
*/
void ACPI_INTERNAL_VAR_XFACE
acpi_error(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
void ACPI_INTERNAL_VAR_XFACE
acpi_exception(const char *module_name,
u32 line_number,
acpi_status status, const char *format, ...) ACPI_PRINTF_LIKE(4);
void ACPI_INTERNAL_VAR_XFACE
acpi_warning(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
void ACPI_INTERNAL_VAR_XFACE
acpi_info(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
#ifdef ACPI_DEBUG_OUTPUT
void ACPI_INTERNAL_VAR_XFACE
acpi_debug_print(u32 requested_debug_level,
u32 line_number,
const char *function_name,
const char *module_name,
u32 component_id, const char *format, ...) ACPI_PRINTF_LIKE(6);
void ACPI_INTERNAL_VAR_XFACE
acpi_debug_print_raw(u32 requested_debug_level,
u32 line_number,
const char *function_name,
const char *module_name,
u32 component_id,
const char *format, ...) ACPI_PRINTF_LIKE(6);
#endif
#endif /* __ACXFACE_H__ */ #endif /* __ACXFACE_H__ */
include/acpi/acrestyp.h 0 → 100644
View file @ 50df4d8b
/******************************************************************************
*
* Name: acrestyp.h - Defines, types, and structures for resource descriptors
*
*****************************************************************************/
/*
* Copyright (C) 2000 - 2008, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions, and the following disclaimer,
* without modification.
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
* substantially similar to the "NO WARRANTY" disclaimer below
* ("Disclaimer") and any redistribution must be conditioned upon
* including a substantially similar Disclaimer requirement for further
* binary redistribution.
* 3. Neither the names of the above-listed copyright holders nor the names
* of any contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* Alternatively, this software may be distributed under the terms of the
* GNU General Public License ("GPL") version 2 as published by the Free
* Software Foundation.
*
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*/
#ifndef __ACRESTYP_H__
#define __ACRESTYP_H__
/*
* Definitions for Resource Attributes
*/
typedef u16 acpi_rs_length; /* Resource Length field is fixed at 16 bits */
typedef u32 acpi_rsdesc_size; /* Max Resource Descriptor size is (Length+3) = (64_k-1)+3 */
/*
* Memory Attributes
*/
#define ACPI_READ_ONLY_MEMORY (u8) 0x00
#define ACPI_READ_WRITE_MEMORY (u8) 0x01
#define ACPI_NON_CACHEABLE_MEMORY (u8) 0x00
#define ACPI_CACHABLE_MEMORY (u8) 0x01
#define ACPI_WRITE_COMBINING_MEMORY (u8) 0x02
#define ACPI_PREFETCHABLE_MEMORY (u8) 0x03
/*
* IO Attributes
* The ISA IO ranges are: n000-n0_fFh, n400-n4_fFh, n800-n8_fFh, n_c00-n_cFFh.
* The non-ISA IO ranges are: n100-n3_fFh, n500-n7_fFh, n900-n_bFFh, n_cd0-n_fFFh.
*/
#define ACPI_NON_ISA_ONLY_RANGES (u8) 0x01
#define ACPI_ISA_ONLY_RANGES (u8) 0x02
#define ACPI_ENTIRE_RANGE (ACPI_NON_ISA_ONLY_RANGES | ACPI_ISA_ONLY_RANGES)
/* Type of translation - 1=Sparse, 0=Dense */
#define ACPI_SPARSE_TRANSLATION (u8) 0x01
/*
* IO Port Descriptor Decode
*/
#define ACPI_DECODE_10 (u8) 0x00 /* 10-bit IO address decode */
#define ACPI_DECODE_16 (u8) 0x01 /* 16-bit IO address decode */
/*
* IRQ Attributes
*/
#define ACPI_LEVEL_SENSITIVE (u8) 0x00
#define ACPI_EDGE_SENSITIVE (u8) 0x01
#define ACPI_ACTIVE_HIGH (u8) 0x00
#define ACPI_ACTIVE_LOW (u8) 0x01
#define ACPI_EXCLUSIVE (u8) 0x00
#define ACPI_SHARED (u8) 0x01
/*
* DMA Attributes
*/
#define ACPI_COMPATIBILITY (u8) 0x00
#define ACPI_TYPE_A (u8) 0x01
#define ACPI_TYPE_B (u8) 0x02
#define ACPI_TYPE_F (u8) 0x03
#define ACPI_NOT_BUS_MASTER (u8) 0x00
#define ACPI_BUS_MASTER (u8) 0x01
#define ACPI_TRANSFER_8 (u8) 0x00
#define ACPI_TRANSFER_8_16 (u8) 0x01
#define ACPI_TRANSFER_16 (u8) 0x02
/*
* Start Dependent Functions Priority definitions
*/
#define ACPI_GOOD_CONFIGURATION (u8) 0x00
#define ACPI_ACCEPTABLE_CONFIGURATION (u8) 0x01
#define ACPI_SUB_OPTIMAL_CONFIGURATION (u8) 0x02
/*
* 16, 32 and 64-bit Address Descriptor resource types
*/
#define ACPI_MEMORY_RANGE (u8) 0x00
#define ACPI_IO_RANGE (u8) 0x01
#define ACPI_BUS_NUMBER_RANGE (u8) 0x02
#define ACPI_ADDRESS_NOT_FIXED (u8) 0x00
#define ACPI_ADDRESS_FIXED (u8) 0x01
#define ACPI_POS_DECODE (u8) 0x00
#define ACPI_SUB_DECODE (u8) 0x01
#define ACPI_PRODUCER (u8) 0x00
#define ACPI_CONSUMER (u8) 0x01
/*
* If possible, pack the following structures to byte alignment
*/
#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
#pragma pack(1)
#endif
/* UUID data structures for use in vendor-defined resource descriptors */
struct acpi_uuid {
u8 data[ACPI_UUID_LENGTH];
};
struct acpi_vendor_uuid {
u8 subtype;
u8 data[ACPI_UUID_LENGTH];
};
/*
* Structures used to describe device resources
*/
struct acpi_resource_irq {
u8 descriptor_length;
u8 triggering;
u8 polarity;
u8 sharable;
u8 interrupt_count;
u8 interrupts[1];
};
struct acpi_resource_dma {
u8 type;
u8 bus_master;
u8 transfer;
u8 channel_count;
u8 channels[1];
};
struct acpi_resource_start_dependent {
u8 descriptor_length;
u8 compatibility_priority;
u8 performance_robustness;
};
/*
* The END_DEPENDENT_FUNCTIONS_RESOURCE struct is not
* needed because it has no fields
*/
struct acpi_resource_io {
u8 io_decode;
u8 alignment;
u8 address_length;
u16 minimum;
u16 maximum;
};
struct acpi_resource_fixed_io {
u16 address;
u8 address_length;
};
struct acpi_resource_vendor {
u16 byte_length;
u8 byte_data[1];
};
/* Vendor resource with UUID info (introduced in ACPI 3.0) */
struct acpi_resource_vendor_typed {
u16 byte_length;
u8 uuid_subtype;
u8 uuid[ACPI_UUID_LENGTH];
u8 byte_data[1];
};
struct acpi_resource_end_tag {
u8 checksum;
};
struct acpi_resource_memory24 {
u8 write_protect;
u16 minimum;
u16 maximum;
u16 alignment;
u16 address_length;
};
struct acpi_resource_memory32 {
u8 write_protect;
u32 minimum;
u32 maximum;
u32 alignment;
u32 address_length;
};
struct acpi_resource_fixed_memory32 {
u8 write_protect;
u32 address;
u32 address_length;
};
struct acpi_memory_attribute {
u8 write_protect;
u8 caching;
u8 range_type;
u8 translation;
};
struct acpi_io_attribute {
u8 range_type;
u8 translation;
u8 translation_type;
u8 reserved1;
};
union acpi_resource_attribute {
struct acpi_memory_attribute mem;
struct acpi_io_attribute io;
/* Used for the *word_space macros */
u8 type_specific;
};
struct acpi_resource_source {
u8 index;
u16 string_length;
char *string_ptr;
};
/* Fields common to all address descriptors, 16/32/64 bit */
#define ACPI_RESOURCE_ADDRESS_COMMON \
u8 resource_type; \
u8 producer_consumer; \
u8 decode; \
u8 min_address_fixed; \
u8 max_address_fixed; \
union acpi_resource_attribute info;
struct acpi_resource_address {
ACPI_RESOURCE_ADDRESS_COMMON};
struct acpi_resource_address16 {
ACPI_RESOURCE_ADDRESS_COMMON u16 granularity;
u16 minimum;
u16 maximum;
u16 translation_offset;
u16 address_length;
struct acpi_resource_source resource_source;
};
struct acpi_resource_address32 {
ACPI_RESOURCE_ADDRESS_COMMON u32 granularity;
u32 minimum;
u32 maximum;
u32 translation_offset;
u32 address_length;
struct acpi_resource_source resource_source;
};
struct acpi_resource_address64 {
ACPI_RESOURCE_ADDRESS_COMMON u64 granularity;
u64 minimum;
u64 maximum;
u64 translation_offset;
u64 address_length;
struct acpi_resource_source resource_source;
};
struct acpi_resource_extended_address64 {
ACPI_RESOURCE_ADDRESS_COMMON u8 revision_iD;
u64 granularity;
u64 minimum;
u64 maximum;
u64 translation_offset;
u64 address_length;
u64 type_specific;
};
struct acpi_resource_extended_irq {
u8 producer_consumer;
u8 triggering;
u8 polarity;
u8 sharable;
u8 interrupt_count;
struct acpi_resource_source resource_source;
u32 interrupts[1];
};
struct acpi_resource_generic_register {
u8 space_id;
u8 bit_width;
u8 bit_offset;
u8 access_size;
u64 address;
};
/* ACPI_RESOURCE_TYPEs */
#define ACPI_RESOURCE_TYPE_IRQ 0
#define ACPI_RESOURCE_TYPE_DMA 1
#define ACPI_RESOURCE_TYPE_START_DEPENDENT 2
#define ACPI_RESOURCE_TYPE_END_DEPENDENT 3
#define ACPI_RESOURCE_TYPE_IO 4
#define ACPI_RESOURCE_TYPE_FIXED_IO 5
#define ACPI_RESOURCE_TYPE_VENDOR 6
#define ACPI_RESOURCE_TYPE_END_TAG 7
#define ACPI_RESOURCE_TYPE_MEMORY24 8
#define ACPI_RESOURCE_TYPE_MEMORY32 9
#define ACPI_RESOURCE_TYPE_FIXED_MEMORY32 10
#define ACPI_RESOURCE_TYPE_ADDRESS16 11
#define ACPI_RESOURCE_TYPE_ADDRESS32 12
#define ACPI_RESOURCE_TYPE_ADDRESS64 13
#define ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 14 /* ACPI 3.0 */
#define ACPI_RESOURCE_TYPE_EXTENDED_IRQ 15
#define ACPI_RESOURCE_TYPE_GENERIC_REGISTER 16
#define ACPI_RESOURCE_TYPE_MAX 16
/* Master union for resource descriptors */
union acpi_resource_data {
struct acpi_resource_irq irq;
struct acpi_resource_dma dma;
struct acpi_resource_start_dependent start_dpf;
struct acpi_resource_io io;
struct acpi_resource_fixed_io fixed_io;
struct acpi_resource_vendor vendor;
struct acpi_resource_vendor_typed vendor_typed;
struct acpi_resource_end_tag end_tag;
struct acpi_resource_memory24 memory24;
struct acpi_resource_memory32 memory32;
struct acpi_resource_fixed_memory32 fixed_memory32;
struct acpi_resource_address16 address16;
struct acpi_resource_address32 address32;
struct acpi_resource_address64 address64;
struct acpi_resource_extended_address64 ext_address64;
struct acpi_resource_extended_irq extended_irq;
struct acpi_resource_generic_register generic_reg;
/* Common fields */
struct acpi_resource_address address; /* Common 16/32/64 address fields */
};
/* Common resource header */
struct acpi_resource {
u32 type;
u32 length;
union acpi_resource_data data;
};
/* restore default alignment */
#pragma pack()
#define ACPI_RS_SIZE_NO_DATA 8 /* Id + Length fields */
#define ACPI_RS_SIZE_MIN (u32) ACPI_ROUND_UP_TO_NATIVE_WORD (12)
#define ACPI_RS_SIZE(type) (u32) (ACPI_RS_SIZE_NO_DATA + sizeof (type))
#define ACPI_NEXT_RESOURCE(res) (struct acpi_resource *)((u8 *) res + res->length)
struct acpi_pci_routing_table {
u32 length;
u32 pin;
acpi_integer address; /* here for 64-bit alignment */
u32 source_index;
char source[4]; /* pad to 64 bits so sizeof() works in all cases */
};
#endif /* __ACRESTYP_H__ */
include/acpi/actbl.h
View file @ 50df4d8b
...@@ -288,6 +288,31 @@ enum acpi_prefered_pm_profiles { ...@@ -288,6 +288,31 @@ enum acpi_prefered_pm_profiles {
#define ACPI_FADT_OFFSET(f) (u8) ACPI_OFFSET (struct acpi_table_fadt, f) #define ACPI_FADT_OFFSET(f) (u8) ACPI_OFFSET (struct acpi_table_fadt, f)
union acpi_name_union {
u32 integer;
char ascii[4];
};
/*
* Internal ACPI Table Descriptor. One per ACPI table
*/
struct acpi_table_desc {
acpi_physical_address address;
struct acpi_table_header *pointer;
u32 length; /* Length fixed at 32 bits */
union acpi_name_union signature;
acpi_owner_id owner_id;
u8 flags;
};
/* Flags for above */
#define ACPI_TABLE_ORIGIN_UNKNOWN (0)
#define ACPI_TABLE_ORIGIN_MAPPED (1)
#define ACPI_TABLE_ORIGIN_ALLOCATED (2)
#define ACPI_TABLE_ORIGIN_MASK (3)
#define ACPI_TABLE_IS_LOADED (4)
/* /*
* Get the remaining ACPI tables * Get the remaining ACPI tables
*/ */
......
include/acpi/actypes.h
View file @ 50df4d8b
...@@ -233,7 +233,11 @@ typedef u32 acpi_physical_address; ...@@ -233,7 +233,11 @@ typedef u32 acpi_physical_address;
/* Object returned from acpi_os_create_cache */ /* Object returned from acpi_os_create_cache */
#ifndef acpi_cache_t #ifndef acpi_cache_t
#ifdef ACPI_USE_LOCAL_CACHE
#define acpi_cache_t struct acpi_memory_list #define acpi_cache_t struct acpi_memory_list
#else
#define acpi_cache_t void *
#endif
#endif #endif
/* Use C99 uintptr_t for pointer casting if available, "void *" otherwise */ /* Use C99 uintptr_t for pointer casting if available, "void *" otherwise */
...@@ -268,6 +272,37 @@ typedef u32 acpi_physical_address; ...@@ -268,6 +272,37 @@ typedef u32 acpi_physical_address;
#define ACPI_EXPORT_SYMBOL(symbol) #define ACPI_EXPORT_SYMBOL(symbol)
#endif #endif
/******************************************************************************
*
* ACPI Specification constants (Do not change unless the specification changes)
*
*****************************************************************************/
/* Number of distinct GPE register blocks and register width */
#define ACPI_MAX_GPE_BLOCKS 2
#define ACPI_GPE_REGISTER_WIDTH 8
/* Names within the namespace are 4 bytes long */
#define ACPI_NAME_SIZE 4
#define ACPI_PATH_SEGMENT_LENGTH 5 /* 4 chars for name + 1 char for separator */
#define ACPI_PATH_SEPARATOR '.'
/* Sizes for ACPI table headers */
#define ACPI_OEM_ID_SIZE 6
#define ACPI_OEM_TABLE_ID_SIZE 8
/* ACPI/PNP hardware IDs */
#define PCI_ROOT_HID_STRING "PNP0A03"
#define PCI_EXPRESS_ROOT_HID_STRING "PNP0A08"
/* PM Timer ticks per second (HZ) */
#define PM_TIMER_FREQUENCY 3579545
/******************************************************************************* /*******************************************************************************
* *
* Independent types * Independent types
...@@ -298,6 +333,11 @@ typedef u32 acpi_name; /* 4-byte ACPI name */ ...@@ -298,6 +333,11 @@ typedef u32 acpi_name; /* 4-byte ACPI name */
typedef char *acpi_string; /* Null terminated ASCII string */ typedef char *acpi_string; /* Null terminated ASCII string */
typedef void *acpi_handle; /* Actually a ptr to a NS Node */ typedef void *acpi_handle; /* Actually a ptr to a NS Node */
/* Owner IDs are used to track namespace nodes for selective deletion */
typedef u8 acpi_owner_id;
#define ACPI_OWNER_ID_MAX 0xFF
struct uint64_struct { struct uint64_struct {
u32 lo; u32 lo;
u32 hi; u32 hi;
...@@ -338,10 +378,75 @@ typedef unsigned long long acpi_integer; ...@@ -338,10 +378,75 @@ typedef unsigned long long acpi_integer;
#define ACPI_MAX16_DECIMAL_DIGITS 5 #define ACPI_MAX16_DECIMAL_DIGITS 5
#define ACPI_MAX8_DECIMAL_DIGITS 3 #define ACPI_MAX8_DECIMAL_DIGITS 3
/* PM Timer ticks per second (HZ) */
#define PM_TIMER_FREQUENCY 3579545
/* /*
* Constants with special meanings * Constants with special meanings
*/ */
#define ACPI_ROOT_OBJECT ACPI_ADD_PTR (acpi_handle, NULL, ACPI_MAX_PTR) #define ACPI_ROOT_OBJECT ACPI_ADD_PTR (acpi_handle, NULL, ACPI_MAX_PTR)
#define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */
#define ACPI_DO_NOT_WAIT 0
/*******************************************************************************
*
* Commonly used macros
*
******************************************************************************/
/* Data manipulation */
#define ACPI_LOWORD(l) ((u16)(u32)(l))
#define ACPI_HIWORD(l) ((u16)((((u32)(l)) >> 16) & 0xFFFF))
#define ACPI_LOBYTE(l) ((u8)(u16)(l))
#define ACPI_HIBYTE(l) ((u8)((((u16)(l)) >> 8) & 0xFF))
/* Full 64-bit integer must be available on both 32-bit and 64-bit platforms */
struct acpi_integer_overlay {
u32 lo_dword;
u32 hi_dword;
};
#define ACPI_LODWORD(integer) (ACPI_CAST_PTR (struct acpi_integer_overlay, &integer)->lo_dword)
#define ACPI_HIDWORD(integer) (ACPI_CAST_PTR (struct acpi_integer_overlay, &integer)->hi_dword)
#define ACPI_SET_BIT(target,bit) ((target) |= (bit))
#define ACPI_CLEAR_BIT(target,bit) ((target) &= ~(bit))
#define ACPI_MIN(a,b) (((a)<(b))?(a):(b))
#define ACPI_MAX(a,b) (((a)>(b))?(a):(b))
/* Size calculation */
#define ACPI_ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
/* Pointer manipulation */
#define ACPI_CAST_PTR(t, p) ((t *) (acpi_uintptr_t) (p))
#define ACPI_CAST_INDIRECT_PTR(t, p) ((t **) (acpi_uintptr_t) (p))
#define ACPI_ADD_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (u8, (a)) + (acpi_size)(b)))
#define ACPI_PTR_DIFF(a, b) (acpi_size) (ACPI_CAST_PTR (u8, (a)) - ACPI_CAST_PTR (u8, (b)))
/* Pointer/Integer type conversions */
#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) NULL,(acpi_size) i)
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) NULL)
#define ACPI_OFFSET(d, f) (acpi_size) ACPI_PTR_DIFF (&(((d *)0)->f), (void *) NULL)
#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)
#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
#define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (u32, (a)) == *ACPI_CAST_PTR (u32, (b)))
#else
#define ACPI_COMPARE_NAME(a,b) (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE))
#endif
/*******************************************************************************
*
* Miscellaneous constants
*
******************************************************************************/
/* /*
* Initialization sequence * Initialization sequence
...@@ -731,6 +836,15 @@ struct acpi_buffer { ...@@ -731,6 +836,15 @@ struct acpi_buffer {
#define ACPI_SINGLE_NAME 1 #define ACPI_SINGLE_NAME 1
#define ACPI_NAME_TYPE_MAX 1 #define ACPI_NAME_TYPE_MAX 1
/*
* Predefined Namespace items
*/
struct acpi_predefined_names {
char *name;
u8 type;
char *val;
};
/* /*
* Structure and flags for acpi_get_system_info * Structure and flags for acpi_get_system_info
*/ */
...@@ -823,6 +937,12 @@ acpi_status(*acpi_walk_callback) (acpi_handle obj_handle, ...@@ -823,6 +937,12 @@ acpi_status(*acpi_walk_callback) (acpi_handle obj_handle,
#define ACPI_INTERRUPT_NOT_HANDLED 0x00 #define ACPI_INTERRUPT_NOT_HANDLED 0x00
#define ACPI_INTERRUPT_HANDLED 0x01 #define ACPI_INTERRUPT_HANDLED 0x01
/* Length of _HID, _UID, _CID, and UUID values */
#define ACPI_DEVICE_ID_LENGTH 0x09
#define ACPI_MAX_CID_LENGTH 48
#define ACPI_UUID_LENGTH 16
/* Common string version of device HIDs and UIDs */ /* Common string version of device HIDs and UIDs */
struct acpica_device_id { struct acpica_device_id {
...@@ -900,357 +1020,28 @@ struct acpi_mem_space_context { ...@@ -900,357 +1020,28 @@ struct acpi_mem_space_context {
}; };
/* /*
* Definitions for Resource Attributes * struct acpi_memory_list is used only if the ACPICA local cache is enabled
*/ */
typedef u16 acpi_rs_length; /* Resource Length field is fixed at 16 bits */ struct acpi_memory_list {
typedef u32 acpi_rsdesc_size; /* Max Resource Descriptor size is (Length+3) = (64_k-1)+3 */ char *list_name;
void *list_head;
/* u16 object_size;
* Memory Attributes u16 max_depth;
*/ u16 current_depth;
#define ACPI_READ_ONLY_MEMORY (u8) 0x00 u16 link_offset;
#define ACPI_READ_WRITE_MEMORY (u8) 0x01
#ifdef ACPI_DBG_TRACK_ALLOCATIONS
#define ACPI_NON_CACHEABLE_MEMORY (u8) 0x00
#define ACPI_CACHABLE_MEMORY (u8) 0x01 /* Statistics for debug memory tracking only */
#define ACPI_WRITE_COMBINING_MEMORY (u8) 0x02
#define ACPI_PREFETCHABLE_MEMORY (u8) 0x03 u32 total_allocated;
u32 total_freed;
/* u32 max_occupied;
* IO Attributes u32 total_size;
* The ISA IO ranges are: n000-n0_fFh, n400-n4_fFh, n800-n8_fFh, n_c00-n_cFFh. u32 current_total_size;
* The non-ISA IO ranges are: n100-n3_fFh, n500-n7_fFh, n900-n_bFFh, n_cd0-n_fFFh. u32 requests;
*/ u32 hits;
#define ACPI_NON_ISA_ONLY_RANGES (u8) 0x01
#define ACPI_ISA_ONLY_RANGES (u8) 0x02
#define ACPI_ENTIRE_RANGE (ACPI_NON_ISA_ONLY_RANGES | ACPI_ISA_ONLY_RANGES)
/* Type of translation - 1=Sparse, 0=Dense */
#define ACPI_SPARSE_TRANSLATION (u8) 0x01
/*
* IO Port Descriptor Decode
*/
#define ACPI_DECODE_10 (u8) 0x00 /* 10-bit IO address decode */
#define ACPI_DECODE_16 (u8) 0x01 /* 16-bit IO address decode */
/*
* IRQ Attributes
*/
#define ACPI_LEVEL_SENSITIVE (u8) 0x00
#define ACPI_EDGE_SENSITIVE (u8) 0x01
#define ACPI_ACTIVE_HIGH (u8) 0x00
#define ACPI_ACTIVE_LOW (u8) 0x01
#define ACPI_EXCLUSIVE (u8) 0x00
#define ACPI_SHARED (u8) 0x01
/*
* DMA Attributes
*/
#define ACPI_COMPATIBILITY (u8) 0x00
#define ACPI_TYPE_A (u8) 0x01
#define ACPI_TYPE_B (u8) 0x02
#define ACPI_TYPE_F (u8) 0x03
#define ACPI_NOT_BUS_MASTER (u8) 0x00
#define ACPI_BUS_MASTER (u8) 0x01
#define ACPI_TRANSFER_8 (u8) 0x00
#define ACPI_TRANSFER_8_16 (u8) 0x01
#define ACPI_TRANSFER_16 (u8) 0x02
/*
* Start Dependent Functions Priority definitions
*/
#define ACPI_GOOD_CONFIGURATION (u8) 0x00
#define ACPI_ACCEPTABLE_CONFIGURATION (u8) 0x01
#define ACPI_SUB_OPTIMAL_CONFIGURATION (u8) 0x02
/*
* 16, 32 and 64-bit Address Descriptor resource types
*/
#define ACPI_MEMORY_RANGE (u8) 0x00
#define ACPI_IO_RANGE (u8) 0x01
#define ACPI_BUS_NUMBER_RANGE (u8) 0x02
#define ACPI_ADDRESS_NOT_FIXED (u8) 0x00
#define ACPI_ADDRESS_FIXED (u8) 0x01
#define ACPI_POS_DECODE (u8) 0x00
#define ACPI_SUB_DECODE (u8) 0x01
#define ACPI_PRODUCER (u8) 0x00
#define ACPI_CONSUMER (u8) 0x01
/*
* If possible, pack the following structures to byte alignment
*/
#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
#pragma pack(1)
#endif #endif
/* UUID data structures for use in vendor-defined resource descriptors */
struct acpi_uuid {
u8 data[ACPI_UUID_LENGTH];
};
struct acpi_vendor_uuid {
u8 subtype;
u8 data[ACPI_UUID_LENGTH];
};
/*
* Structures used to describe device resources
*/
struct acpi_resource_irq {
u8 descriptor_length;
u8 triggering;
u8 polarity;
u8 sharable;
u8 interrupt_count;
u8 interrupts[1];
};
struct acpi_resource_dma {
u8 type;
u8 bus_master;
u8 transfer;
u8 channel_count;
u8 channels[1];
};
struct acpi_resource_start_dependent {
u8 descriptor_length;
u8 compatibility_priority;
u8 performance_robustness;
};
/*
* END_DEPENDENT_FUNCTIONS_RESOURCE struct is not
* needed because it has no fields
*/
struct acpi_resource_io {
u8 io_decode;
u8 alignment;
u8 address_length;
u16 minimum;
u16 maximum;
};
struct acpi_resource_fixed_io {
u16 address;
u8 address_length;
};
struct acpi_resource_vendor {
u16 byte_length;
u8 byte_data[1];
};
/* Vendor resource with UUID info (introduced in ACPI 3.0) */
struct acpi_resource_vendor_typed {
u16 byte_length;
u8 uuid_subtype;
u8 uuid[ACPI_UUID_LENGTH];
u8 byte_data[1];
};
struct acpi_resource_end_tag {
u8 checksum;
};
struct acpi_resource_memory24 {
u8 write_protect;
u16 minimum;
u16 maximum;
u16 alignment;
u16 address_length;
};
struct acpi_resource_memory32 {
u8 write_protect;
u32 minimum;
u32 maximum;
u32 alignment;
u32 address_length;
};
struct acpi_resource_fixed_memory32 {
u8 write_protect;
u32 address;
u32 address_length;
};
struct acpi_memory_attribute {
u8 write_protect;
u8 caching;
u8 range_type;
u8 translation;
};
struct acpi_io_attribute {
u8 range_type;
u8 translation;
u8 translation_type;
u8 reserved1;
};
union acpi_resource_attribute {
struct acpi_memory_attribute mem;
struct acpi_io_attribute io;
/* Used for the *word_space macros */
u8 type_specific;
};
struct acpi_resource_source {
u8 index;
u16 string_length;
char *string_ptr;
};
/* Fields common to all address descriptors, 16/32/64 bit */
#define ACPI_RESOURCE_ADDRESS_COMMON \
u8 resource_type; \
u8 producer_consumer; \
u8 decode; \
u8 min_address_fixed; \
u8 max_address_fixed; \
union acpi_resource_attribute info;
struct acpi_resource_address {
ACPI_RESOURCE_ADDRESS_COMMON};
struct acpi_resource_address16 {
ACPI_RESOURCE_ADDRESS_COMMON u16 granularity;
u16 minimum;
u16 maximum;
u16 translation_offset;
u16 address_length;
struct acpi_resource_source resource_source;
};
struct acpi_resource_address32 {
ACPI_RESOURCE_ADDRESS_COMMON u32 granularity;
u32 minimum;
u32 maximum;
u32 translation_offset;
u32 address_length;
struct acpi_resource_source resource_source;
};
struct acpi_resource_address64 {
ACPI_RESOURCE_ADDRESS_COMMON u64 granularity;
u64 minimum;
u64 maximum;
u64 translation_offset;
u64 address_length;
struct acpi_resource_source resource_source;
};
struct acpi_resource_extended_address64 {
ACPI_RESOURCE_ADDRESS_COMMON u8 revision_iD;
u64 granularity;
u64 minimum;
u64 maximum;
u64 translation_offset;
u64 address_length;
u64 type_specific;
};
struct acpi_resource_extended_irq {
u8 producer_consumer;
u8 triggering;
u8 polarity;
u8 sharable;
u8 interrupt_count;
struct acpi_resource_source resource_source;
u32 interrupts[1];
};
struct acpi_resource_generic_register {
u8 space_id;
u8 bit_width;
u8 bit_offset;
u8 access_size;
u64 address;
};
/* ACPI_RESOURCE_TYPEs */
#define ACPI_RESOURCE_TYPE_IRQ 0
#define ACPI_RESOURCE_TYPE_DMA 1
#define ACPI_RESOURCE_TYPE_START_DEPENDENT 2
#define ACPI_RESOURCE_TYPE_END_DEPENDENT 3
#define ACPI_RESOURCE_TYPE_IO 4
#define ACPI_RESOURCE_TYPE_FIXED_IO 5
#define ACPI_RESOURCE_TYPE_VENDOR 6
#define ACPI_RESOURCE_TYPE_END_TAG 7
#define ACPI_RESOURCE_TYPE_MEMORY24 8
#define ACPI_RESOURCE_TYPE_MEMORY32 9
#define ACPI_RESOURCE_TYPE_FIXED_MEMORY32 10
#define ACPI_RESOURCE_TYPE_ADDRESS16 11
#define ACPI_RESOURCE_TYPE_ADDRESS32 12
#define ACPI_RESOURCE_TYPE_ADDRESS64 13
#define ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 14 /* ACPI 3.0 */
#define ACPI_RESOURCE_TYPE_EXTENDED_IRQ 15
#define ACPI_RESOURCE_TYPE_GENERIC_REGISTER 16
#define ACPI_RESOURCE_TYPE_MAX 16
union acpi_resource_data {
struct acpi_resource_irq irq;
struct acpi_resource_dma dma;
struct acpi_resource_start_dependent start_dpf;
struct acpi_resource_io io;
struct acpi_resource_fixed_io fixed_io;
struct acpi_resource_vendor vendor;
struct acpi_resource_vendor_typed vendor_typed;
struct acpi_resource_end_tag end_tag;
struct acpi_resource_memory24 memory24;
struct acpi_resource_memory32 memory32;
struct acpi_resource_fixed_memory32 fixed_memory32;
struct acpi_resource_address16 address16;
struct acpi_resource_address32 address32;
struct acpi_resource_address64 address64;
struct acpi_resource_extended_address64 ext_address64;
struct acpi_resource_extended_irq extended_irq;
struct acpi_resource_generic_register generic_reg;
/* Common fields */
struct acpi_resource_address address; /* Common 16/32/64 address fields */
};
struct acpi_resource {
u32 type;
u32 length;
union acpi_resource_data data;
};
/* restore default alignment */
#pragma pack()
#define ACPI_RS_SIZE_NO_DATA 8 /* Id + Length fields */
#define ACPI_RS_SIZE_MIN (u32) ACPI_ROUND_UP_TO_NATIVE_WORD (12)
#define ACPI_RS_SIZE(type) (u32) (ACPI_RS_SIZE_NO_DATA + sizeof (type))
#define ACPI_NEXT_RESOURCE(res) (struct acpi_resource *)((u8 *) res + res->length)
struct acpi_pci_routing_table {
u32 length;
u32 pin;
acpi_integer address; /* here for 64-bit alignment */
u32 source_index;
char source[4]; /* pad to 64 bits so sizeof() works in all cases */
}; };
#endif /* __ACTYPES_H__ */ #endif /* __ACTYPES_H__ */
include/acpi/acutils.h
View file @ 50df4d8b
...@@ -297,42 +297,6 @@ void acpi_ut_report_info(char *module_name, u32 line_number); ...@@ -297,42 +297,6 @@ void acpi_ut_report_info(char *module_name, u32 line_number);
void acpi_ut_report_warning(char *module_name, u32 line_number); void acpi_ut_report_warning(char *module_name, u32 line_number);
/* Error and message reporting interfaces */
void ACPI_INTERNAL_VAR_XFACE
acpi_ut_debug_print(u32 requested_debug_level,
u32 line_number,
const char *function_name,
const char *module_name,
u32 component_id,
const char *format, ...) ACPI_PRINTF_LIKE(6);
void ACPI_INTERNAL_VAR_XFACE
acpi_ut_debug_print_raw(u32 requested_debug_level,
u32 line_number,
const char *function_name,
const char *module_name,
u32 component_id,
const char *format, ...) ACPI_PRINTF_LIKE(6);
void ACPI_INTERNAL_VAR_XFACE
acpi_ut_error(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
void ACPI_INTERNAL_VAR_XFACE
acpi_ut_exception(const char *module_name,
u32 line_number,
acpi_status status,
const char *format, ...) ACPI_PRINTF_LIKE(4);
void ACPI_INTERNAL_VAR_XFACE
acpi_ut_warning(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
void ACPI_INTERNAL_VAR_XFACE
acpi_ut_info(const char *module_name,
u32 line_number, const char *format, ...) ACPI_PRINTF_LIKE(3);
/* /*
* utdelete - Object deletion and reference counts * utdelete - Object deletion and reference counts
*/ */
......
include/acpi/platform/acenv.h
View file @ 50df4d8b
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
/* /*
* Configuration for ACPI tools and utilities * Configuration for ACPI tools and utilities
*/ */
#ifdef ACPI_LIBRARY #ifdef ACPI_LIBRARY
/* /*
* Note: The non-debug version of the acpi_library does not contain any * Note: The non-debug version of the acpi_library does not contain any
...@@ -75,17 +74,6 @@ ...@@ -75,17 +74,6 @@
#define ACPI_DBG_TRACK_ALLOCATIONS #define ACPI_DBG_TRACK_ALLOCATIONS
#endif #endif
#ifdef ACPI_DASM_APP
#ifndef MSDOS
#define ACPI_DEBUG_OUTPUT
#endif
#define ACPI_APPLICATION
#define ACPI_DISASSEMBLER
#define ACPI_NO_METHOD_EXECUTION
#define ACPI_LARGE_NAMESPACE_NODE
#define ACPI_DATA_TABLE_DISASSEMBLY
#endif
#ifdef ACPI_APPLICATION #ifdef ACPI_APPLICATION
#define ACPI_USE_SYSTEM_CLIBRARY #define ACPI_USE_SYSTEM_CLIBRARY
#define ACPI_USE_LOCAL_CACHE #define ACPI_USE_LOCAL_CACHE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7