diff options
Diffstat (limited to 'source/tools')
-rw-r--r-- | source/tools/acpibin/Makefile | 130 | ||||
-rw-r--r-- | source/tools/acpiexec/Makefile | 288 | ||||
-rw-r--r-- | source/tools/acpihelp/Makefile | 123 | ||||
-rw-r--r-- | source/tools/acpinames/Makefile | 191 | ||||
-rw-r--r-- | source/tools/acpisrc/Makefile | 124 | ||||
-rw-r--r-- | source/tools/acpisrc/asmain.c | 10 | ||||
-rw-r--r-- | source/tools/acpisrc/astable.c | 14 | ||||
-rw-r--r-- | source/tools/acpixtract/Makefile | 116 |
8 files changed, 19 insertions, 977 deletions
diff --git a/source/tools/acpibin/Makefile b/source/tools/acpibin/Makefile deleted file mode 100644 index 7d95f61aac29..000000000000 --- a/source/tools/acpibin/Makefile +++ /dev/null @@ -1,130 +0,0 @@ -# -# acpibin - Binary ACPI table utility -# -# NOTE: This makefile is intended to be used within the native -# ACPICA source tree. -# - -# -# Configuration -# Notes: -# gcc should be version 4 or greater, otherwise some of the options -# used will not be recognized. -# Global optimization flags (such as -O2, -Os) are not used, since -# they cause issues on some compilers. -# The _GNU_SOURCE symbol is required for many hosts. -# -PROG = acpibin - -HOST = _LINUX -NOMAN = YES -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< - -ACPICA_SRC = ../../../source -ACPICA_COMMON = $(ACPICA_SRC)/common -ACPICA_TOOLS = $(ACPICA_SRC)/tools -ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers -ACPICA_CORE = $(ACPICA_SRC)/components -ACPICA_INCLUDE = $(ACPICA_SRC)/include -ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger -ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler -ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher -ACPICA_EVENTS = $(ACPICA_CORE)/events -ACPICA_EXECUTER = $(ACPICA_CORE)/executer -ACPICA_HARDWARE = $(ACPICA_CORE)/hardware -ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace -ACPICA_PARSER = $(ACPICA_CORE)/parser -ACPICA_RESOURCES = $(ACPICA_CORE)/resources -ACPICA_TABLES = $(ACPICA_CORE)/tables -ACPICA_UTILITIES = $(ACPICA_CORE)/utilities -ACPIBIN = $(ACPICA_TOOLS)/acpibin -INSTALLDIR = /usr/bin -INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) - -ACPICA_HEADERS = \ - $(wildcard $(ACPICA_INCLUDE)/*.h) \ - $(wildcard $(ACPICA_INCLUDE)/platform/*.h) - -# -# Search paths for source files -# -vpath %.c \ - $(ACPIBIN) \ - $(ACPICA_UTILITIES) \ - $(ACPICA_COMMON) \ - $(ACPICA_OSL) - -HEADERS = \ - $(wildcard $(ACPIBIN)/*.h) - -OBJECTS = \ - abcompare.o \ - abmain.o \ - utalloc.o \ - utcache.o \ - utdebug.o \ - utdecode.o \ - utexcep.o \ - utglobal.o \ - utlock.o \ - utmath.o \ - utmisc.o \ - utmutex.o \ - utstate.o \ - utxferror.o \ - osunixxf.o \ - getopt.o - -CFLAGS+= \ - -D$(HOST) \ - -D_GNU_SOURCE \ - -DACPI_BIN_APP \ - -I$(ACPICA_INCLUDE) - -CWARNINGFLAGS = \ - -ansi \ - -Wall \ - -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wstrict-aliasing=0 \ - -Wstrict-prototypes \ - -Wswitch-default \ - -Wpointer-arith \ - -Wundef - -# -# gcc 4+ flags -# -CWARNINGFLAGS += \ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ - -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-parameter-type \ - -Wnested-externs \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wredundant-decls \ - -Wtype-limits - -# -# Rules -# -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - -%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) diff --git a/source/tools/acpiexec/Makefile b/source/tools/acpiexec/Makefile deleted file mode 100644 index 4d379f5642bb..000000000000 --- a/source/tools/acpiexec/Makefile +++ /dev/null @@ -1,288 +0,0 @@ -# -# acpiexec: ACPI execution simulator. Runs ACPICA code in user -# space. Loads ACPI tables, displays the namespace, and allows -# execution of control methods. -# -# NOTE: This makefile is intended to be used within the native -# ACPICA source tree. -# - -# -# Configuration -# Notes: -# gcc should be version 4 or greater, otherwise some of the options -# used will not be recognized. -# Global optimization flags (such as -O2, -Os) are not used, since -# they cause issues on some compilers. -# The _GNU_SOURCE symbol is required for many hosts. -# -PROG = acpiexec - -HOST = _LINUX -NOMAN = YES -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< -LDFLAGS += -lpthread -lrt - -ACPICA_SRC = ../../../source -ACPICA_COMMON = $(ACPICA_SRC)/common -ACPICA_TOOLS = $(ACPICA_SRC)/tools -ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers -ACPICA_CORE = $(ACPICA_SRC)/components -ACPICA_INCLUDE = $(ACPICA_SRC)/include -ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger -ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler -ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher -ACPICA_EVENTS = $(ACPICA_CORE)/events -ACPICA_EXECUTER = $(ACPICA_CORE)/executer -ACPICA_HARDWARE = $(ACPICA_CORE)/hardware -ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace -ACPICA_PARSER = $(ACPICA_CORE)/parser -ACPICA_RESOURCES = $(ACPICA_CORE)/resources -ACPICA_TABLES = $(ACPICA_CORE)/tables -ACPICA_UTILITIES = $(ACPICA_CORE)/utilities -ACPIEXEC = $(ACPICA_TOOLS)/acpiexec -INSTALLDIR = /usr/bin -INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) - -ACPICA_HEADERS = \ - $(wildcard $(ACPICA_INCLUDE)/*.h) \ - $(wildcard $(ACPICA_INCLUDE)/platform/*.h) - -# -# Search paths for source files -# -vpath %.c \ - $(ACPIEXEC) \ - $(ACPICA_DEBUGGER) \ - $(ACPICA_DISASSEMBLER) \ - $(ACPICA_DISPATCHER) \ - $(ACPICA_EVENTS) \ - $(ACPICA_EXECUTER) \ - $(ACPICA_HARDWARE) \ - $(ACPICA_NAMESPACE) \ - $(ACPICA_PARSER) \ - $(ACPICA_RESOURCES) \ - $(ACPICA_TABLES) \ - $(ACPICA_UTILITIES) \ - $(ACPICA_COMMON) \ - $(ACPICA_OSL) - -HEADERS = \ - $(wildcard $(ACPIEXEC)/*.h) - -OBJECTS = \ - aeexec.o \ - aehandlers.o \ - aemain.o \ - aetables.o \ - dbcmds.o \ - dbdisply.o \ - dbexec.o \ - dbfileio.o \ - dbhistry.o \ - dbinput.o \ - dbmethod.o \ - dbnames.o \ - dbstats.o \ - dbutils.o \ - dbxface.o \ - dmbuffer.o \ - dmnames.o \ - dmobject.o \ - dmopcode.o \ - dmresrc.o \ - dmresrcl.o \ - dmresrcl2.o \ - dmresrcs.o \ - dmutils.o \ - dmwalk.o \ - dsargs.o \ - dscontrol.o \ - dsfield.o \ - dsinit.o \ - dsmethod.o \ - dsmthdat.o \ - dsobject.o \ - dsopcode.o \ - dsutils.o \ - dswexec.o \ - dswload.o \ - dswload2.o \ - dswscope.o \ - dswstate.o \ - evevent.o \ - evglock.o \ - evgpe.o \ - evgpeblk.o \ - evgpeinit.o \ - evgpeutil.o \ - evmisc.o \ - evregion.o \ - evrgnini.o \ - evsci.o \ - evxface.o \ - evxfevnt.o \ - evxfgpe.o \ - evxfregn.o \ - exconfig.o \ - exconvrt.o \ - excreate.o \ - exdebug.o \ - exdump.o \ - exfield.o \ - exfldio.o \ - exmisc.o \ - exmutex.o \ - exnames.o \ - exoparg1.o \ - exoparg2.o \ - exoparg3.o \ - exoparg6.o \ - exprep.o \ - exregion.o \ - exresnte.o \ - exresolv.o \ - exresop.o \ - exstore.o \ - exstoren.o \ - exstorob.o \ - exsystem.o \ - exutils.o \ - getopt.o \ - hwacpi.o \ - hwesleep.o \ - hwgpe.o \ - hwpci.o \ - hwregs.o \ - hwsleep.o \ - hwvalid.o \ - hwxface.o \ - hwxfsleep.o \ - nsaccess.o \ - nsalloc.o \ - nsdump.o \ - nsdumpdv.o \ - nseval.o \ - nsinit.o \ - nsload.o \ - nsnames.o \ - nsobject.o \ - nsparse.o \ - nspredef.o \ - nsrepair.o \ - nsrepair2.o \ - nssearch.o \ - nsutils.o \ - nswalk.o \ - nsxfeval.o \ - nsxfname.o \ - nsxfobj.o \ - osunixxf.o \ - psargs.o \ - psloop.o \ - psopcode.o \ - psparse.o \ - psscope.o \ - pstree.o \ - psutils.o \ - pswalk.o \ - psxface.o \ - rsaddr.o \ - rscalc.o \ - rscreate.o \ - rsdump.o \ - rsinfo.o \ - rsio.o \ - rsirq.o \ - rslist.o \ - rsmemory.o \ - rsserial.o \ - rsmisc.o \ - rsutils.o \ - rsxface.o \ - tbfadt.o \ - tbfind.o \ - tbinstal.o \ - tbutils.o \ - tbxface.o \ - tbxfload.o \ - tbxfroot.o \ - utaddress.o \ - utalloc.o \ - utcache.o \ - utcopy.o \ - utdebug.o \ - utdecode.o \ - utdelete.o \ - uteval.o \ - utexcep.o \ - utglobal.o \ - utids.o \ - utinit.o \ - utlock.o \ - utmath.o \ - utmisc.o \ - utmutex.o \ - utobject.o \ - utresrc.o \ - utstate.o \ - uttrack.o \ - utosi.o \ - utxferror.o \ - utxface.o \ - utxfmutex.o - -CFLAGS+= \ - -D$(HOST) \ - -D_GNU_SOURCE \ - -DACPI_EXEC_APP \ - -I$(ACPICA_INCLUDE) - -CWARNINGFLAGS = \ - -ansi \ - -Wall \ - -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wstrict-aliasing=0 \ - -Wstrict-prototypes \ - -Wswitch-default \ - -Wpointer-arith \ - -Wundef - -# -# gcc 4+ flags -# -CWARNINGFLAGS += \ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ - -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-parameter-type \ - -Wnested-externs \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wredundant-decls \ - -Wtype-limits - -# -# Rules -# -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) diff --git a/source/tools/acpihelp/Makefile b/source/tools/acpihelp/Makefile deleted file mode 100644 index d0bcb3e834e7..000000000000 --- a/source/tools/acpihelp/Makefile +++ /dev/null @@ -1,123 +0,0 @@ -# -# acpihelp - ACPI Help utility. Displays ASL operator syntax and -# information about ACPI predefined names. -# -# NOTE: This makefile is intended to be used within the native -# ACPICA source tree. -# - -# -# Configuration -# Notes: -# gcc should be version 4 or greater, otherwise some of the options -# used will not be recognized. -# Global optimization flags (such as -O2, -Os) are not used, since -# they cause issues on some compilers. -# The _GNU_SOURCE symbol is required for many hosts. -# -PROG = acpihelp - -HOST = _LINUX -NOMAN = YES -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< - -ACPICA_SRC = ../../../source -ACPICA_COMMON = $(ACPICA_SRC)/common -ACPICA_TOOLS = $(ACPICA_SRC)/tools -ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers -ACPICA_CORE = $(ACPICA_SRC)/components -ACPICA_INCLUDE = $(ACPICA_SRC)/include -ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger -ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler -ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher -ACPICA_EVENTS = $(ACPICA_CORE)/events -ACPICA_EXECUTER = $(ACPICA_CORE)/executer -ACPICA_HARDWARE = $(ACPICA_CORE)/hardware -ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace -ACPICA_PARSER = $(ACPICA_CORE)/parser -ACPICA_RESOURCES = $(ACPICA_CORE)/resources -ACPICA_TABLES = $(ACPICA_CORE)/tables -ACPICA_UTILITIES = $(ACPICA_CORE)/utilities -ACPIHELP = $(ACPICA_TOOLS)/acpihelp -INSTALLDIR = /usr/bin -INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) - -ACPICA_HEADERS = \ - $(wildcard $(ACPICA_INCLUDE)/*.h) \ - $(wildcard $(ACPICA_INCLUDE)/platform/*.h) - -# -# Search paths for source files -# -vpath %.c \ - $(ACPIHELP) \ - $(ACPICA_COMMON) \ - $(ACPICA_UTILITIES) - -HEADERS = \ - $(wildcard $(ACPIHELP)/*.h) - -OBJECTS = \ - ahamlops.o \ - ahaslkey.o \ - ahaslops.o \ - ahdecode.o \ - ahpredef.o \ - ahmain.o \ - getopt.o \ - utexcep.o - -CFLAGS+= \ - -D$(HOST) \ - -D_GNU_SOURCE \ - -DACPI_HELP_APP \ - -I$(ACPICA_INCLUDE) - -CWARNINGFLAGS = \ - -ansi \ - -Wall \ - -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wstrict-aliasing=0 \ - -Wstrict-prototypes \ - -Wswitch-default \ - -Wpointer-arith \ - -Wundef - -# -# gcc 4+ flags -# -CWARNINGFLAGS += \ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ - -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-parameter-type \ - -Wnested-externs \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wredundant-decls \ - -Wtype-limits - -# -# Rules -# -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) diff --git a/source/tools/acpinames/Makefile b/source/tools/acpinames/Makefile deleted file mode 100644 index 3a8c42db02c2..000000000000 --- a/source/tools/acpinames/Makefile +++ /dev/null @@ -1,191 +0,0 @@ -# -# acpinames - Load ACPI table and dump namespace. This is a subset -# of the AcpiExec functionality, it is intended to demonstrate -# the configurability of ACPICA. -# -# NOTE: This makefile is intended to be used in the Linux environment, -# with the Linux directory structure. It will not work directly -# on the native ACPICA source tree. -# - -# -# Configuration -# Notes: -# gcc should be version 4 or greater, otherwise some of the options -# used will not be recognized. -# Global optimization flags (such as -O2, -Os) are not used, since -# they cause issues on some compilers. -# The _GNU_SOURCE symbol is required for many hosts. -# -PROG = acpinames - -HOST = _LINUX -NOMAN = YES -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< - -ACPICA_SRC = ../../../source -ACPICA_COMMON = $(ACPICA_SRC)/common -ACPICA_TOOLS = $(ACPICA_SRC)/tools -ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers -ACPICA_CORE = $(ACPICA_SRC)/components -ACPICA_INCLUDE = $(ACPICA_SRC)/include -ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger -ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler -ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher -ACPICA_EVENTS = $(ACPICA_CORE)/events -ACPICA_EXECUTER = $(ACPICA_CORE)/executer -ACPICA_HARDWARE = $(ACPICA_CORE)/hardware -ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace -ACPICA_PARSER = $(ACPICA_CORE)/parser -ACPICA_RESOURCES = $(ACPICA_CORE)/resources -ACPICA_TABLES = $(ACPICA_CORE)/tables -ACPICA_UTILITIES = $(ACPICA_CORE)/utilities -ACPINAMES = $(ACPICA_TOOLS)/acpinames -INSTALLDIR = /usr/bin -INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) - -ACPICA_HEADERS = \ - $(wildcard $(ACPICA_INCLUDE)/*.h) \ - $(wildcard $(ACPICA_INCLUDE)/platform/*.h) - -# -# Search paths for source files -# -vpath %.c \ - $(ACPINAMES) \ - $(ACPICA_DEBUGGER) \ - $(ACPICA_DISPATCHER) \ - $(ACPICA_EXECUTER) \ - $(ACPICA_NAMESPACE) \ - $(ACPICA_PARSER) \ - $(ACPICA_TABLES) \ - $(ACPICA_UTILITIES) \ - $(ACPICA_COMMON) \ - $(ACPICA_OSL) - -HEADERS = \ - $(wildcard $(ACPINAMES)/*.h) - -OBJECTS = \ - anmain.o \ - anstubs.o \ - antables.o \ - dbfileio.o \ - dsfield.o \ - dsmthdat.o \ - dsobject.o \ - dsutils.o \ - dswload.o \ - dswload2.o \ - dswscope.o \ - dswstate.o \ - excreate.o \ - exnames.o \ - exresnte.o \ - exresolv.o \ - exutils.o \ - getopt.o \ - nsaccess.o \ - nsalloc.o \ - nsdump.o \ - nsinit.o \ - nsload.o \ - nsnames.o \ - nsobject.o \ - nsparse.o \ - nssearch.o \ - nsutils.o \ - nswalk.o \ - nsxfeval.o \ - nsxfname.o \ - nsxfobj.o \ - osunixxf.o \ - psargs.o \ - psloop.o \ - psopcode.o \ - psparse.o \ - psscope.o \ - pstree.o \ - psutils.o \ - pswalk.o \ - psxface.o \ - tbfadt.o \ - tbfind.o \ - tbinstal.o \ - tbutils.o \ - tbxface.o \ - tbxfload.o \ - tbxfroot.o \ - utaddress.o \ - utalloc.o \ - utcache.o \ - utdebug.o \ - utdecode.o \ - utdelete.o \ - utexcep.o \ - utglobal.o \ - utlock.o \ - utmath.o \ - utmisc.o \ - utmutex.o \ - utobject.o \ - utstate.o \ - utosi.o \ - utxferror.o \ - utxface.o - -CFLAGS+= \ - -D$(HOST) \ - -D_GNU_SOURCE \ - -DACPI_NAMES_APP \ - -I$(ACPICA_INCLUDE) \ - -I$(ACPINAMES) - -CWARNINGFLAGS = \ - -ansi \ - -Wall \ - -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wstrict-aliasing=0 \ - -Wstrict-prototypes \ - -Wswitch-default \ - -Wpointer-arith \ - -Wundef - -# -# gcc 4+ flags -# -CWARNINGFLAGS += \ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ - -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-parameter-type \ - -Wnested-externs \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wredundant-decls \ - -Wtype-limits - -# -# Rules -# -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) diff --git a/source/tools/acpisrc/Makefile b/source/tools/acpisrc/Makefile deleted file mode 100644 index 58a8654e350c..000000000000 --- a/source/tools/acpisrc/Makefile +++ /dev/null @@ -1,124 +0,0 @@ -# -# acpisrc - ACPICA source code conversion utility -# -# NOTE: This makefile is intended to be used in the Linux environment, -# with the Linux directory structure. It will not work directly -# on the native ACPICA source tree. -# - -# -# Configuration -# Notes: -# gcc should be version 4 or greater, otherwise some of the options -# used will not be recognized. -# Global optimization flags (such as -O2, -Os) are not used, since -# they cause issues on some compilers. -# The _GNU_SOURCE symbol is required for many hosts. -# -PROG = acpisrc - -HOST = _LINUX -NOMAN = YES -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< - -ACPICA_SRC = ../../../source -ACPICA_COMMON = $(ACPICA_SRC)/common -ACPICA_TOOLS = $(ACPICA_SRC)/tools -ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers -ACPICA_CORE = $(ACPICA_SRC)/components -ACPICA_INCLUDE = $(ACPICA_SRC)/include -ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger -ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler -ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher -ACPICA_EVENTS = $(ACPICA_CORE)/events -ACPICA_EXECUTER = $(ACPICA_CORE)/executer -ACPICA_HARDWARE = $(ACPICA_CORE)/hardware -ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace -ACPICA_PARSER = $(ACPICA_CORE)/parser -ACPICA_RESOURCES = $(ACPICA_CORE)/resources -ACPICA_TABLES = $(ACPICA_CORE)/tables -ACPICA_UTILITIES = $(ACPICA_CORE)/utilities -ACPISRC = $(ACPICA_TOOLS)/acpisrc -INSTALLDIR = /usr/bin -INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) - -ACPICA_HEADERS = \ - $(wildcard $(ACPICA_INCLUDE)/*.h) \ - $(wildcard $(ACPICA_INCLUDE)/platform/*.h) - -# -# Search path for source files and individual source files -# -vpath %.c \ - $(ACPISRC) \ - $(ACPICA_COMMON) \ - $(ACPICA_OSL) - -HEADERS = \ - $(wildcard $(ACPISRC)/*.h) - -OBJECTS = \ - ascase.o \ - asconvrt.o \ - asfile.o \ - asmain.o \ - asremove.o \ - astable.o \ - asutils.o \ - osunixdir.o \ - getopt.o - -CFLAGS+= \ - -D$(HOST) \ - -D_GNU_SOURCE \ - -DACPI_SRC_APP \ - -I$(ACPISRC) \ - -I$(ACPICA_INCLUDE) - -CWARNINGFLAGS = \ - -ansi \ - -Wall \ - -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wstrict-aliasing=0 \ - -Wstrict-prototypes \ - -Wswitch-default \ - -Wpointer-arith \ - -Wundef - -# -# gcc 4+ flags -# -CWARNINGFLAGS += \ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ - -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-parameter-type \ - -Wnested-externs \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wredundant-decls \ - -Wtype-limits - -# -# Rules -# -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - -%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) diff --git a/source/tools/acpisrc/asmain.c b/source/tools/acpisrc/asmain.c index b1f3402de9cd..e36855b5d872 100644 --- a/source/tools/acpisrc/asmain.c +++ b/source/tools/acpisrc/asmain.c @@ -147,7 +147,7 @@ AsExaminePaths ( UINT32 *SourceFileType) { int Status; - char Response; + int Response; Status = stat (Source, &Gbl_StatBuf); @@ -177,11 +177,11 @@ AsExaminePaths ( if (!AsStricmp (Source, Target)) { printf ("Target path is the same as the source path, overwrite?\n"); - scanf ("%c", &Response); + Response = getchar (); /* Check response */ - if ((char) Response != 'y') + if (Response != 'y') { return -1; } @@ -194,11 +194,11 @@ AsExaminePaths ( if (!Status) { printf ("Target path already exists, overwrite?\n"); - scanf ("%c", &Response); + Response = getchar (); /* Check response */ - if ((char) Response != 'y') + if (Response != 'y') { return -1; } diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c index b7defe7959b4..1d782f48357d 100644 --- a/source/tools/acpisrc/astable.c +++ b/source/tools/acpisrc/astable.c @@ -411,6 +411,15 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_WALK_STATE", SRC_TYPE_STRUCT}, {"ACPI_WHEA_HEADER", SRC_TYPE_STRUCT}, + /* Buffers related to predefined ACPI names (_PLD, etc.) */ + + {"ACPI_FDE_INFO", SRC_TYPE_STRUCT}, + {"ACPI_GRT_INFO", SRC_TYPE_STRUCT}, + {"ACPI_GTM_INFO", SRC_TYPE_STRUCT}, + {"ACPI_PLD_INFO", SRC_TYPE_STRUCT}, + + /* Resources */ + {"ACPI_RS_LENGTH", SRC_TYPE_SIMPLE}, {"ACPI_RSDESC_SIZE", SRC_TYPE_SIMPLE}, @@ -474,6 +483,8 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_TABLE_BGRT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_BOOT", SRC_TYPE_STRUCT}, {"ACPI_TABLE_CPEP", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_CSRT", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_DBG2", SRC_TYPE_STRUCT}, {"ACPI_TABLE_DBGP", SRC_TYPE_STRUCT}, {"ACPI_TABLE_DMAR", SRC_TYPE_STRUCT}, {"ACPI_TABLE_DRTM", SRC_TYPE_STRUCT}, @@ -521,6 +532,9 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_ASF_RMCP", SRC_TYPE_STRUCT}, {"ACPI_BERT_REGION", SRC_TYPE_STRUCT}, {"ACPI_CPEP_POLLING", SRC_TYPE_STRUCT}, + {"ACPI_CSRT_GROUP", SRC_TYPE_STRUCT}, + {"ACPI_CSRT_DESCRIPTOR", SRC_TYPE_STRUCT}, + {"ACPI_DBG2_DEVICE", SRC_TYPE_STRUCT}, {"ACPI_DMAR_HEADER", SRC_TYPE_STRUCT}, {"ACPI_DMAR_DEVICE_SCOPE", SRC_TYPE_STRUCT}, {"ACPI_DMAR_ATSR", SRC_TYPE_STRUCT}, diff --git a/source/tools/acpixtract/Makefile b/source/tools/acpixtract/Makefile deleted file mode 100644 index d5db832a7394..000000000000 --- a/source/tools/acpixtract/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# -# acpixtract - extract binary ACPI tables from acpidump text output -# -# NOTE: This makefile is intended to be used within the native -# ACPICA source tree. -# - -# -# Configuration -# Notes: -# gcc should be version 4 or greater, otherwise some of the options -# used will not be recognized. -# Global optimization flags (such as -O2, -Os) are not used, since -# they cause issues on some compilers. -# The _GNU_SOURCE symbol is required for many hosts. -# -PROG = acpixtract - -HOST = _LINUX -NOMAN = YES -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< - -ACPICA_SRC = ../../../source -ACPICA_COMMON = $(ACPICA_SRC)/common -ACPICA_TOOLS = $(ACPICA_SRC)/tools -ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers -ACPICA_CORE = $(ACPICA_SRC)/components -ACPICA_INCLUDE = $(ACPICA_SRC)/include -ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger -ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler -ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher -ACPICA_EVENTS = $(ACPICA_CORE)/events -ACPICA_EXECUTER = $(ACPICA_CORE)/executer -ACPICA_HARDWARE = $(ACPICA_CORE)/hardware -ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace -ACPICA_PARSER = $(ACPICA_CORE)/parser -ACPICA_RESOURCES = $(ACPICA_CORE)/resources -ACPICA_TABLES = $(ACPICA_CORE)/tables -ACPICA_UTILITIES = $(ACPICA_CORE)/utilities -ACPIXTRACT = $(ACPICA_TOOLS)/acpixtract -INSTALLDIR = /usr/bin -INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) - -ACPICA_HEADERS = \ - $(wildcard $(ACPICA_INCLUDE)/*.h) \ - $(wildcard $(ACPICA_INCLUDE)/platform/*.h) - -# -# Search paths for source files -# -vpath %.c \ - $(ACPIXTRACT) \ - $(ACPICA_COMMON) - -HEADERS = \ - $(wildcard $(ACPIXTRACT)/*.h) - -OBJECTS = \ - acpixtract.o \ - axmain.o \ - getopt.o - -CFLAGS+= \ - -D$(HOST) \ - -D_GNU_SOURCE \ - -DACPI_XTRACT_APP \ - -I$(ACPICA_INCLUDE) - -CWARNINGFLAGS = \ - -ansi \ - -Wall \ - -Wbad-function-cast \ - -Wdeclaration-after-statement \ - -Werror \ - -Wformat=2 \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wstrict-aliasing=0 \ - -Wstrict-prototypes \ - -Wswitch-default \ - -Wpointer-arith \ - -Wundef - -# -# gcc 4+ flags -# -CWARNINGFLAGS += \ - -Waddress \ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ - -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ - -Wmissing-parameter-type \ - -Wnested-externs \ - -Wold-style-declaration \ - -Wold-style-definition \ - -Wredundant-decls \ - -Wtype-limits - -# -# Rules -# -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) |