From owner-svn-src-vendor@FreeBSD.ORG Thu Aug 16 17:26:23 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 974871065673; Thu, 16 Aug 2012 17:26:23 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7DB138FC19; Thu, 16 Aug 2012 17:26:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7GHQNTT045341; Thu, 16 Aug 2012 17:26:23 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7GHQNGl045323; Thu, 16 Aug 2012 17:26:23 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201208161726.q7GHQNGl045323@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 16 Aug 2012 17:26:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239332 - in vendor-sys/acpica/dist: . generate/release generate/unix generate/unix/acpibin generate/unix/acpiexec generate/unix/acpihelp generate/unix/acpinames generate/unix/acpisrc g... X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 17:26:23 -0000 Author: jkim Date: Thu Aug 16 17:26:22 2012 New Revision: 239332 URL: http://svn.freebsd.org/changeset/base/239332 Log: Import ACPICA 20120816. Added: vendor-sys/acpica/dist/generate/unix/Makefile.rules (contents, props changed) vendor-sys/acpica/dist/source/compiler/new_table.txt (contents, props changed) vendor-sys/acpica/dist/source/components/utilities/utxfinit.c (contents, props changed) vendor-sys/acpica/dist/source/include/acbuffer.h (contents, props changed) vendor-sys/acpica/dist/source/include/platform/achaiku.h (contents, props changed) Deleted: vendor-sys/acpica/dist/README vendor-sys/acpica/dist/source/compiler/Makefile vendor-sys/acpica/dist/source/tools/acpibin/Makefile vendor-sys/acpica/dist/source/tools/acpiexec/Makefile vendor-sys/acpica/dist/source/tools/acpihelp/Makefile vendor-sys/acpica/dist/source/tools/acpinames/Makefile vendor-sys/acpica/dist/source/tools/acpisrc/Makefile vendor-sys/acpica/dist/source/tools/acpixtract/Makefile Modified: vendor-sys/acpica/dist/changes.txt vendor-sys/acpica/dist/generate/release/build.sh vendor-sys/acpica/dist/generate/unix/Makefile.common vendor-sys/acpica/dist/generate/unix/Makefile.config vendor-sys/acpica/dist/generate/unix/acpibin/Makefile vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile vendor-sys/acpica/dist/generate/unix/acpinames/Makefile vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile vendor-sys/acpica/dist/generate/unix/iasl/Makefile vendor-sys/acpica/dist/source/common/adisasm.c vendor-sys/acpica/dist/source/common/ahpredef.c vendor-sys/acpica/dist/source/common/dmtable.c vendor-sys/acpica/dist/source/common/dmtbdump.c vendor-sys/acpica/dist/source/common/dmtbinfo.c vendor-sys/acpica/dist/source/compiler/aslcompiler.h vendor-sys/acpica/dist/source/compiler/aslcompiler.y vendor-sys/acpica/dist/source/compiler/aslfold.c vendor-sys/acpica/dist/source/compiler/aslmessages.h vendor-sys/acpica/dist/source/compiler/asltree.c vendor-sys/acpica/dist/source/compiler/aslutils.c vendor-sys/acpica/dist/source/components/debugger/dbcmds.c vendor-sys/acpica/dist/source/components/debugger/dbexec.c vendor-sys/acpica/dist/source/components/disassembler/dmbuffer.c vendor-sys/acpica/dist/source/components/disassembler/dmopcode.c vendor-sys/acpica/dist/source/components/dispatcher/dswload.c vendor-sys/acpica/dist/source/components/dispatcher/dswload2.c vendor-sys/acpica/dist/source/components/events/evgpe.c vendor-sys/acpica/dist/source/components/events/evxfgpe.c vendor-sys/acpica/dist/source/components/hardware/hwesleep.c vendor-sys/acpica/dist/source/components/hardware/hwgpe.c vendor-sys/acpica/dist/source/components/hardware/hwsleep.c vendor-sys/acpica/dist/source/components/hardware/hwxfsleep.c vendor-sys/acpica/dist/source/components/namespace/nsdump.c vendor-sys/acpica/dist/source/components/utilities/utosi.c vendor-sys/acpica/dist/source/components/utilities/utxface.c vendor-sys/acpica/dist/source/components/utilities/utxferror.c vendor-sys/acpica/dist/source/include/acdisasm.h vendor-sys/acpica/dist/source/include/achware.h vendor-sys/acpica/dist/source/include/aclocal.h vendor-sys/acpica/dist/source/include/acmacros.h vendor-sys/acpica/dist/source/include/acnames.h vendor-sys/acpica/dist/source/include/acpixf.h vendor-sys/acpica/dist/source/include/actbl.h vendor-sys/acpica/dist/source/include/actbl1.h vendor-sys/acpica/dist/source/include/actbl2.h vendor-sys/acpica/dist/source/include/actbl3.h vendor-sys/acpica/dist/source/include/actypes.h vendor-sys/acpica/dist/source/include/platform/acenv.h vendor-sys/acpica/dist/source/os_specific/service_layers/osunixxf.c vendor-sys/acpica/dist/source/os_specific/service_layers/oswinxf.c vendor-sys/acpica/dist/source/tools/acpisrc/asmain.c vendor-sys/acpica/dist/source/tools/acpisrc/astable.c Modified: vendor-sys/acpica/dist/changes.txt ============================================================================== --- vendor-sys/acpica/dist/changes.txt Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/changes.txt Thu Aug 16 17:26:22 2012 (r239332) @@ -1,4 +1,97 @@ ---------------------------------------- +16 August 2012. Summary of changes for version 20120816: + +This release is available at https://www.acpica.org/downloads +The ACPI 5.0 specification is available at www.acpi.info + +1) ACPICA Kernel-resident Subsystem: + +Removed all use of the deprecated _GTS and _BFS predefined methods. The _GTS +(Going To Sleep) and _BFS (Back From Sleep) methods are essentially +deprecated and will probably be removed from the ACPI specification. Windows +does not invoke them, and reportedly never will. The final nail in the coffin +is that the ACPI specification states that these methods must be run with +interrupts off, which is not going to happen in a kernel interpreter. Note: +Linux has removed all use of the methods also. It was discovered that +invoking these functions caused failures on some machines, probably because +they were never tested since Windows does not call them. Affects two external +interfaces, AcpiEnterSleepState and AcpiLeaveSleepStatePrep. Tang Feng. +ACPICA BZ 969. + +Implemented support for complex bit-packed buffers returned from the _PLD +(Physical Location of Device) predefined method. Adds a new external +interface, AcpiDecodePldBuffer that parses the buffer into a more usable C +structure. Note: C Bitfields cannot be used for this type of predefined +structure since the memory layout of individual bitfields is not defined by +the C language. In addition, there are endian concerns where a compiler will +change the bitfield ordering based on the machine type. The new ACPICA +interface eliminates these issues, and should be called after _PLD is +executed. ACPICA BZ 954. + +Implemented a change to allow a scope change to root (via "Scope (\)") during +execution of module-level ASL code (code that is executed at table load +time.) Lin Ming. + +Added the Windows8/Server2012 string for the _OSI method. This change adds a +new _OSI string, "Windows 2012" for both Windows 8 and Windows Server 2012. + +Added header support for the new ACPI tables DBG2 (Debug Port Table Type 2) +and CSRT (Core System Resource Table). + +Added struct header support for the _FDE, _GRT, _GTM, and _SRT predefined +names. This simplifies access to the buffers returned by these predefined +names. Adds a new file, include/acbuffer.h. ACPICA BZ 956. + +GPE support: Removed an extraneous parameter from the various low-level +internal GPE functions. Tang Feng. + +Removed the linux makefiles from the unix packages. The generate/linux +makefiles are obsolete and have been removed from the unix tarball release +packages. The replacement makefiles are under generate/unix, and there is a +top-level makefile under the main acpica directory. ACPICA BZ 967, 912. + +Updates for Unix makefiles: +1) Add -D_FORTIFY_SOURCE=2 for gcc generation. Arjan van de Ven. +2) Update linker flags (move to end of command line) for AcpiExec utility. +Guan Chao. + +Split ACPICA initialization functions to new file, utxfinit.c. Split from +utxface.c to improve modularity and reduce file size. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release: + Non-Debug Version: 93.5K Code, 25.3K Data, 118.8K Total + Debug Version: 173.7K Code, 74.0K Data, 247.7K Total + Current Release: + Non-Debug Version: 93.8K Code, 25.3K Data, 119.1K Total + Debug Version: 175.7K Code, 74.8K Data, 250.5K Total + + +2) iASL Compiler/Disassembler and Tools: + +iASL: Fixed a problem with constant folding for fixed-length constant +expressions. The constant-folding code was not being invoked for constant +expressions that allow the use of type 3/4/5 opcodes to generate constants +for expressions such as ByteConstExpr, WordConstExpr, etc. This could result +in the generation of invalid AML bytecode. ACPICA BZ 970. + +iASL: Fixed a generation issue on newer versions of Bison. Newer versions +apparently automatically emit some of the necessary externals. This change +handles these versions in order to eliminate generation warnings. + +Disassembler: Added support to decode the DBG2 and CSRT ACPI tables. + +Disassembler: Add support to decode _PLD buffers. The decoded buffer appears +within comments in the output file. + +Debugger: Fixed a regression with the "Threads" command where +AE_BAD_PARAMETER was always returned. + +---------------------------------------- 11 July 2012. Summary of changes for version 20120711: This release is available at https://www.acpica.org/downloads The ACPI 5.0 Modified: vendor-sys/acpica/dist/generate/release/build.sh ============================================================================== --- vendor-sys/acpica/dist/generate/release/build.sh Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/release/build.sh Thu Aug 16 17:26:22 2012 (r239332) @@ -278,19 +278,6 @@ generate_source_package () # # Unix/Linux-specific activities # - - # Copy Linux/UNIX utility generation makefiles - - cp generate/linux/Makefile.acpibin $TEMP_DIR/source/tools/acpibin/Makefile - cp generate/linux/Makefile.acpiexec $TEMP_DIR/source/tools/acpiexec/Makefile - cp generate/linux/Makefile.acpihelp $TEMP_DIR/source/tools/acpihelp/Makefile - cp generate/linux/Makefile.acpinames $TEMP_DIR/source/tools/acpinames/Makefile - cp generate/linux/Makefile.acpisrc $TEMP_DIR/source/tools/acpisrc/Makefile - cp generate/linux/Makefile.acpixtract $TEMP_DIR/source/tools/acpixtract/Makefile - cp generate/linux/Makefile.iasl $TEMP_DIR/source/compiler/Makefile - cp generate/linux/README.acpica-unix $TEMP_DIR/README - - # # For Unix2 case, insert the dual license header into all source files # if [ $LICENSE == Dual ]; then Modified: vendor-sys/acpica/dist/generate/unix/Makefile.common ============================================================================== --- vendor-sys/acpica/dist/generate/unix/Makefile.common Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/Makefile.common Thu Aug 16 17:26:22 2012 (r239332) @@ -7,6 +7,7 @@ # string will be treated as a 64-bit OS. Otherwise, the default is 32-bit. # HARDWARE_NAME := $(shell uname -m) +BITS=0 # # Main rule will only generate versions that are appropriate for the running @@ -15,16 +16,22 @@ HARDWARE_NAME := $(shell uname -m) all: ${PROGS} ${PROGS}: FORCE @cd $(BUILD_DIRECTORY_PATH)/$@; \ - if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ + if [ $(BITS) -eq 32 ]; then \ + echo "Forced 32-bit generation of $@"; \ + mkdir -p obj32; \ + make BITS=32; \ + echo "32-bit version of $@:"; \ + ls -al ../bin32/$@; \ + elif [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ mkdir -p obj64; \ make BITS=64; \ echo "64-bit version of $@:"; \ - ls -al obj64/$@; \ + ls -al ../bin64/$@; \ else \ mkdir -p obj32; \ make BITS=32; \ echo "32-bit version of $@:"; \ - ls -al obj32/$@; \ + ls -al ../bin32/$@; \ fi; # @@ -63,6 +70,7 @@ both: 32 64 clean: FORCE @for toolname in ${PROGS}; do \ (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ + echo "Removing $$toolname"; \ pwd; \ if [ -d "obj32" ] ; then \ make BITS=32 clean; \ @@ -72,6 +80,7 @@ clean: FORCE make BITS=64 clean; \ rmdir obj64; \ fi; \ + echo ""; \ ); \ done; @@ -83,12 +92,13 @@ install: FORCE (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ pwd; \ if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ - make BITS=64 install; \ + make BITS=64 PROG=$$toolname install; \ echo "Installed 64-bit version of $$toolname"; \ else \ - make BITS=32 install; \ + make BITS=32 PROG=$$toolname install; \ echo "Installed 32-bit version of $$toolname"; \ fi; \ + echo ""; \ ); \ done; Modified: vendor-sys/acpica/dist/generate/unix/Makefile.config ============================================================================== --- vendor-sys/acpica/dist/generate/unix/Makefile.config Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/Makefile.config Thu Aug 16 17:26:22 2012 (r239332) @@ -28,22 +28,30 @@ # The _GNU_SOURCE symbol is required for many hosts. # .SUFFIXES : -PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl -HOST = _CYGWIN -CC = gcc +PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl +HOST = _CYGWIN +CC = gcc # # Common defines # -OBJDIR = obj$(BITS) -BINDIR = bin$(BITS) -BITSFLAG = -m$(BITS) -COMPILE = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< -COPYPROG = @mkdir -p ../$(BINDIR); \ - rm -f ../$(BINDIR)/$(PROG); \ - cp --remove-destination $(PROG) ../$(BINDIR); -INSTALLDIR = /usr/bin -INSTALLPROG = cp --remove-destination $(PROG) $(INSTALLDIR) +OBJDIR = obj$(BITS) +BINDIR = bin$(BITS) +BITSFLAG = -m$(BITS) +COMPILEOBJ = $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $< +LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) + +COPYPROG = \ + @mkdir -p ../$(BINDIR); \ + if [ -e "$(PROG).exe" ] ; then \ + mv $(PROG).exe $(PROG); \ + echo "Renamed $(PROG).exe to $(PROG)"; \ + fi; \ + cp --remove-destination $(PROG) ../$(BINDIR); \ + echo "Copied $(PROG) to ../$(BINDIR)"; + +INSTALLDIR = /usr/bin +INSTALLPROG = install -D ../$(BINDIR)/$(PROG) $(DESTDIR)$(INSTALLDIR)/$(PROG) # # Main ACPICA source directories @@ -92,6 +100,7 @@ CFLAGS += \ $(BITSFLAG) \ -D$(HOST) \ -D_GNU_SOURCE \ + -D_FORTIFY_SOURCE=2 \ -I$(ACPICA_INCLUDE) LDFLAGS += $(BITSFLAG) Added: vendor-sys/acpica/dist/generate/unix/Makefile.rules ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/acpica/dist/generate/unix/Makefile.rules Thu Aug 16 17:26:22 2012 (r239332) @@ -0,0 +1,23 @@ +# +# Common rules for generation of ACPICA utilities +# +# FINAL_PROG - Copies the utility to the local binXX directory (32/64) +# PROG - Builds the utility (links the object files) +# +# Note: $(INTERMEDIATES) and $(MISC) are used for iASL compiler only. +# + +$(FINAL_PROG) : $(PROG) + $(COPYPROG) + +$(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS) + $(LINKPROG) + +$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) + $(COMPILEOBJ) + +clean : + rm -f $(PROG) $(PROG).exe $(OBJECTS) $(INTERMEDIATES) $(MISC) + +install : + $(INSTALLPROG) Modified: vendor-sys/acpica/dist/generate/unix/acpibin/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpibin/Makefile Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/acpibin/Makefile Thu Aug 16 17:26:22 2012 (r239332) @@ -11,6 +11,7 @@ # compile options, and prevents pollution of the source code. # include ../Makefile.config +FINAL_PROG = ../$(BINDIR)/acpibin PROG = $(OBJDIR)/acpibin # @@ -51,17 +52,6 @@ CFLAGS+= \ -I$(ACPIBIN) # -# Rules +# Common Rules # -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) +include ../Makefile.rules Modified: vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/acpiexec/Makefile Thu Aug 16 17:26:22 2012 (r239332) @@ -13,6 +13,7 @@ # compile options, and prevents pollution of the source code. # include ../Makefile.config +FINAL_PROG = ../$(BINDIR)/acpiexec PROG = $(OBJDIR)/acpiexec # @@ -191,12 +192,13 @@ OBJECTS = \ $(OBJDIR)/utmisc.o \ $(OBJDIR)/utmutex.o \ $(OBJDIR)/utobject.o \ + $(OBJDIR)/utosi.o \ $(OBJDIR)/utresrc.o \ $(OBJDIR)/utstate.o \ $(OBJDIR)/uttrack.o \ - $(OBJDIR)/utosi.o \ $(OBJDIR)/utxface.o \ $(OBJDIR)/utxferror.o \ + $(OBJDIR)/utxfinit.o \ $(OBJDIR)/utxfmutex.o # @@ -208,17 +210,6 @@ CFLAGS+= \ LDFLAGS += -lpthread -lrt # -# Rules +# Common Rules # -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) +include ../Makefile.rules Modified: vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/acpihelp/Makefile Thu Aug 16 17:26:22 2012 (r239332) @@ -12,6 +12,7 @@ # compile options, and prevents pollution of the source code. # include ../Makefile.config +FINAL_PROG = ../$(BINDIR)/acpihelp PROG = $(OBJDIR)/acpihelp # @@ -43,17 +44,6 @@ CFLAGS+= \ -I$(ACPIHELP) # -# Rules +# Common Rules # -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) +include ../Makefile.rules Modified: vendor-sys/acpica/dist/generate/unix/acpinames/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/acpinames/Makefile Thu Aug 16 17:26:22 2012 (r239332) @@ -13,6 +13,7 @@ # compile options, and prevents pollution of the source code. # include ../Makefile.config +FINAL_PROG = ../$(BINDIR)/acpinames PROG = $(OBJDIR)/acpinames # @@ -96,10 +97,11 @@ OBJECTS = \ $(OBJDIR)/utmisc.o \ $(OBJDIR)/utmutex.o \ $(OBJDIR)/utobject.o \ - $(OBJDIR)/utstate.o \ $(OBJDIR)/utosi.o \ + $(OBJDIR)/utstate.o \ + $(OBJDIR)/utxface.o \ $(OBJDIR)/utxferror.o \ - $(OBJDIR)/utxface.o + $(OBJDIR)/utxfinit.o # # Flags specific to acpinames utility @@ -109,17 +111,6 @@ CFLAGS+= \ -I$(ACPINAMES) # -# Rules +# Common Rules # -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) +include ../Makefile.rules Modified: vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/acpisrc/Makefile Thu Aug 16 17:26:22 2012 (r239332) @@ -11,6 +11,7 @@ # compile options, and prevents pollution of the source code. # include ../Makefile.config +FINAL_PROG = ../$(BINDIR)/acpisrc PROG = $(OBJDIR)/acpisrc # @@ -43,17 +44,6 @@ CFLAGS+= \ -I$(ACPISRC) # -# Rules +# Common Rules # -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) +include ../Makefile.rules Modified: vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/acpixtract/Makefile Thu Aug 16 17:26:22 2012 (r239332) @@ -11,6 +11,7 @@ # compile options, and prevents pollution of the source code. # include ../Makefile.config +FINAL_PROG = ../$(BINDIR)/acpixtract PROG = $(OBJDIR)/acpixtract # @@ -35,17 +36,6 @@ CFLAGS+= \ -DACPI_XTRACT_APP \ # -# Rules +# Common Rules # -$(PROG) : $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) - -$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) - -install : - $(INSTALLPROG) +include ../Makefile.rules Modified: vendor-sys/acpica/dist/generate/unix/iasl/Makefile ============================================================================== --- vendor-sys/acpica/dist/generate/unix/iasl/Makefile Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/generate/unix/iasl/Makefile Thu Aug 16 17:26:22 2012 (r239332) @@ -11,6 +11,7 @@ # compile options, and prevents pollution of the source code. # include ../Makefile.config +FINAL_PROG = ../$(BINDIR)/iasl PROG = $(OBJDIR)/iasl # @@ -179,8 +180,8 @@ OBJECTS = \ $(OBJDIR)/utobject.o \ $(OBJDIR)/utresrc.o \ $(OBJDIR)/utstate.o \ - $(OBJDIR)/utxferror.o \ - $(OBJDIR)/utxface.o + $(OBJDIR)/utxface.o \ + $(OBJDIR)/utxferror.o INTERMEDIATES = \ $(OBJDIR)/aslcompilerlex.c \ @@ -210,11 +211,10 @@ CFLAGS+= \ -I$(OBJDIR) # -# Root rule +# Common Rules # -$(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) - $(COPYPROG) +include ../Makefile.rules + # # Parser and Lexer - intermediate C files @@ -238,8 +238,9 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa ${YACC} ${YFLAGS} -pPrParser -o$@ $? -# Rename headers produced by bison/yacc - +# +# Rename the headers produced by bison/yacc +# $(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompilerparse.h @echo Copy intermediate file: @cp -f -v $(OBJDIR)/aslcompilerparse.h $(OBJDIR)/aslcompiler.y.h @@ -276,13 +277,3 @@ $(OBJDIR)/prparserlex.o : $(OBJDIR) $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $? - - -$(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) - $(COMPILE) - -clean : - rm -f $(PROG) $(PROG).exe $(OBJECTS) $(INTERMEDIATES) $(MISC) - -install : - $(INSTALLPROG) Modified: vendor-sys/acpica/dist/source/common/adisasm.c ============================================================================== --- vendor-sys/acpica/dist/source/common/adisasm.c Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/source/common/adisasm.c Thu Aug 16 17:26:22 2012 (r239332) @@ -60,9 +60,13 @@ #define _COMPONENT ACPI_TOOLS ACPI_MODULE_NAME ("adisasm") - +/* + * Older versions of Bison won't emit this external in the generated header. + * Newer versions do emit the external, so we don't need to do it. + */ +#ifndef ASLCOMPILER_ASLCOMPILERPARSE_H extern int AslCompilerdebug; - +#endif ACPI_STATUS LsDisplayNamespace ( Modified: vendor-sys/acpica/dist/source/common/ahpredef.c ============================================================================== --- vendor-sys/acpica/dist/source/common/ahpredef.c Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/source/common/ahpredef.c Thu Aug 16 17:26:22 2012 (r239332) @@ -198,7 +198,7 @@ const AH_PREDEFINED_NAME AslPredefine AH_PREDEF ("_PIC", "Interrupt Model", "Inform AML of the interrupt model in use"), AH_PREDEF ("_PIF", "Power Source Information", "Returns a Power Source information block"), AH_PREDEF ("_PIN", "Pin List", "Pin list, Resource Descriptor field"), - AH_PREDEF ("_PLD", "Physical Device Location", "Returns a device's physical location information"), + AH_PREDEF ("_PLD", "Physical Location of Device", "Returns a device's physical location information"), AH_PREDEF ("_PMC", "Power Meter Capabilities", "Returns a list of Power Meter capabilities info"), AH_PREDEF ("_PMD", "Power Metered Devices", "Returns a list of devices that are measured by the power meter device"), AH_PREDEF ("_PMM", "Power Meter Measurement", "Returns the current value of the Power Meter"), Modified: vendor-sys/acpica/dist/source/common/dmtable.c ============================================================================== --- vendor-sys/acpica/dist/source/common/dmtable.c Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/source/common/dmtable.c Thu Aug 16 17:26:22 2012 (r239332) @@ -277,22 +277,24 @@ static const char *AcpiDmGasAc ACPI_DMTABLE_DATA AcpiDmTableData[] = { {ACPI_SIG_ASF, NULL, AcpiDmDumpAsf, DtCompileAsf, TemplateAsf, "Alert Standard Format table"}, - {ACPI_SIG_BOOT, AcpiDmTableInfoBoot, NULL, NULL, TemplateBoot, "Simple Boot Flag Table"}, {ACPI_SIG_BERT, AcpiDmTableInfoBert, NULL, NULL, TemplateBert, "Boot Error Record Table"}, {ACPI_SIG_BGRT, AcpiDmTableInfoBgrt, NULL, NULL, TemplateBgrt, "Boot Graphics Resource Table"}, + {ACPI_SIG_BOOT, AcpiDmTableInfoBoot, NULL, NULL, TemplateBoot, "Simple Boot Flag Table"}, {ACPI_SIG_CPEP, NULL, AcpiDmDumpCpep, DtCompileCpep, TemplateCpep, "Corrected Platform Error Polling table"}, + {ACPI_SIG_CSRT, NULL, AcpiDmDumpCsrt, NULL, NULL, "Core System Resource Table"}, + {ACPI_SIG_DBG2, NULL, AcpiDmDumpDbg2, NULL, NULL, "Debug Port table type 2"}, {ACPI_SIG_DBGP, AcpiDmTableInfoDbgp, NULL, NULL, TemplateDbgp, "Debug Port table"}, {ACPI_SIG_DMAR, NULL, AcpiDmDumpDmar, DtCompileDmar, TemplateDmar, "DMA Remapping table"}, {ACPI_SIG_ECDT, AcpiDmTableInfoEcdt, NULL, NULL, TemplateEcdt, "Embedded Controller Boot Resources Table"}, {ACPI_SIG_EINJ, NULL, AcpiDmDumpEinj, DtCompileEinj, TemplateEinj, "Error Injection table"}, {ACPI_SIG_ERST, NULL, AcpiDmDumpErst, DtCompileErst, TemplateErst, "Error Record Serialization Table"}, - {ACPI_SIG_FADT, NULL, AcpiDmDumpFadt, DtCompileFadt, TemplateFadt, "Fixed ACPI Description Table"}, + {ACPI_SIG_FADT, NULL, AcpiDmDumpFadt, DtCompileFadt, TemplateFadt, "Fixed ACPI Description Table (FADT)"}, {ACPI_SIG_FPDT, NULL, AcpiDmDumpFpdt, DtCompileFpdt, TemplateFpdt, "Firmware Performance Data Table"}, {ACPI_SIG_GTDT, AcpiDmTableInfoGtdt, NULL, NULL, TemplateGtdt, "Generic Timer Description Table"}, {ACPI_SIG_HEST, NULL, AcpiDmDumpHest, DtCompileHest, TemplateHest, "Hardware Error Source Table"}, {ACPI_SIG_HPET, AcpiDmTableInfoHpet, NULL, NULL, TemplateHpet, "High Precision Event Timer table"}, {ACPI_SIG_IVRS, NULL, AcpiDmDumpIvrs, DtCompileIvrs, TemplateIvrs, "I/O Virtualization Reporting Structure"}, - {ACPI_SIG_MADT, NULL, AcpiDmDumpMadt, DtCompileMadt, TemplateMadt, "Multiple APIC Description Table"}, + {ACPI_SIG_MADT, NULL, AcpiDmDumpMadt, DtCompileMadt, TemplateMadt, "Multiple APIC Description Table (MADT)"}, {ACPI_SIG_MCFG, NULL, AcpiDmDumpMcfg, DtCompileMcfg, TemplateMcfg, "Memory Mapped Configuration table"}, {ACPI_SIG_MCHI, AcpiDmTableInfoMchi, NULL, NULL, TemplateMchi, "Management Controller Host Interface table"}, {ACPI_SIG_MPST, AcpiDmTableInfoMpst, AcpiDmDumpMpst, DtCompileMpst, TemplateMpst, "Memory Power State Table"}, Modified: vendor-sys/acpica/dist/source/common/dmtbdump.c ============================================================================== --- vendor-sys/acpica/dist/source/common/dmtbdump.c Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/source/common/dmtbdump.c Thu Aug 16 17:26:22 2012 (r239332) @@ -52,11 +52,79 @@ ACPI_MODULE_NAME ("dmtbdump") +/* Local prototypes */ + static void AcpiDmValidateFadtLength ( UINT32 Revision, UINT32 Length); +static void +AcpiDmDumpBuffer ( + void *Table, + UINT32 BufferOffset, + UINT32 Length, + UINT32 AbsoluteOffset, + char *Header); + + +/******************************************************************************* + * + * FUNCTION: AcpiDmDumpBuffer + * + * PARAMETERS: Table - ACPI Table or subtable + * BufferOffset - Offset of buffer from Table above + * Length - Length of the buffer + * AbsoluteOffset - Offset of buffer in the main ACPI table + * Header - Name of the buffer field (printed on the + * first line only.) + * + * RETURN: None + * + * DESCRIPTION: Format the contents of an arbitrary length data buffer (in the + * disassembler output format.) + * + ******************************************************************************/ + +static void +AcpiDmDumpBuffer ( + void *Table, + UINT32 BufferOffset, + UINT32 Length, + UINT32 AbsoluteOffset, + char *Header) +{ + UINT8 *Buffer; + UINT32 i; + + + if (!Length) + { + return; + } + + Buffer = ACPI_CAST_PTR (UINT8, Table) + BufferOffset; + i = 0; + + while (i < Length) + { + if (!(i % 16)) + { + AcpiOsPrintf ("\n"); + AcpiDmLineHeader (AbsoluteOffset, + ((Length - i) > 16) ? 16 : (Length - i), Header); + Header = NULL; + } + + AcpiOsPrintf ("%.02X ", *Buffer); + i++; + Buffer++; + AbsoluteOffset++; + } + + AcpiOsPrintf ("\n"); +} + /******************************************************************************* * @@ -529,6 +597,208 @@ AcpiDmDumpCpep ( /******************************************************************************* * + * FUNCTION: AcpiDmDumpCsrt + * + * PARAMETERS: Table - A CSRT table + * + * RETURN: None + * + * DESCRIPTION: Format the contents of a CSRT. This table type consists + * of an open-ended number of subtables. + * + ******************************************************************************/ + +void +AcpiDmDumpCsrt ( + ACPI_TABLE_HEADER *Table) +{ + ACPI_STATUS Status; + ACPI_CSRT_GROUP *SubTable; + ACPI_CSRT_DESCRIPTOR *SubSubTable; + UINT32 Length = Table->Length; + UINT32 Offset = sizeof (ACPI_TABLE_CSRT); + UINT32 SubOffset; + UINT32 SubSubOffset; + UINT32 InfoLength; + + + /* The main table only contains the ACPI header, thus already handled */ + + /* Sub-tables (Resource Groups) */ + + SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset); + while (Offset < Table->Length) + { + AcpiOsPrintf ("\n"); + Status = AcpiDmDumpTable (Length, Offset, SubTable, + SubTable->Length, AcpiDmTableInfoCsrt0); + if (ACPI_FAILURE (Status)) + { + return; + } + + SubOffset = sizeof (ACPI_CSRT_GROUP); + + /* Shared resource group info buffer */ + + AcpiDmDumpBuffer (SubTable, SubOffset, SubTable->InfoLength, + Offset+SubOffset, "Shared Data"); + SubOffset += SubTable->InfoLength; + + /* Sub-Sub-tables (Resource Descriptors) */ + + SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table, + Offset + SubOffset); + + while ((SubOffset < SubTable->Length) && + ((Offset + SubOffset) < Table->Length)) + { + AcpiOsPrintf ("\n"); + Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubTable, + SubSubTable->Length, AcpiDmTableInfoCsrt1); + if (ACPI_FAILURE (Status)) + { + return; + } + + SubSubOffset = sizeof (ACPI_CSRT_DESCRIPTOR); + + /* Resource-specific info buffer */ + + InfoLength = SubSubTable->Length - SubSubOffset; + + AcpiDmDumpBuffer (SubSubTable, SubSubOffset, InfoLength, + Offset + SubOffset + SubSubOffset, "ResourceInfo"); + SubSubOffset += InfoLength; + + /* Point to next sub-sub-table */ + + SubOffset += SubSubTable->Length; + SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubTable, + SubSubTable->Length); + } + + /* Point to next sub-table */ + + Offset += SubTable->Length; + SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, SubTable, + SubTable->Length); + } +} + + +/******************************************************************************* + * + * FUNCTION: AcpiDmDumpDbg2 + * + * PARAMETERS: Table - A DBG2 table + * + * RETURN: None + * + * DESCRIPTION: Format the contents of a DBG2. This table type consists + * of an open-ended number of subtables. + * + ******************************************************************************/ + +void +AcpiDmDumpDbg2 ( + ACPI_TABLE_HEADER *Table) +{ + ACPI_STATUS Status; + ACPI_DBG2_DEVICE *SubTable; + UINT32 Length = Table->Length; + UINT32 Offset = sizeof (ACPI_TABLE_DBG2); + UINT32 i; + UINT32 ArrayOffset; + UINT32 AbsoluteOffset; + UINT8 *Array; + + + /* Main table */ + + Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2); + if (ACPI_FAILURE (Status)) + { + return; + } + + /* Sub-tables */ + + SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset); + while (Offset < Table->Length) + { + AcpiOsPrintf ("\n"); + Status = AcpiDmDumpTable (Length, Offset, SubTable, + SubTable->Length, AcpiDmTableInfoDbg2Device); + if (ACPI_FAILURE (Status)) + { + return; + } + + /* Dump the BaseAddress array */ + + for (i = 0; i < SubTable->RegisterCount; i++) + { + ArrayOffset = SubTable->BaseAddressOffset + + (sizeof (ACPI_GENERIC_ADDRESS) * i); + AbsoluteOffset = Offset + ArrayOffset; + Array = (UINT8 *) SubTable + ArrayOffset; + + Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array, + SubTable->Length, AcpiDmTableInfoDbg2Addr); + if (ACPI_FAILURE (Status)) + { + return; + } + } + + /* Dump the AddressSize array */ + + for (i = 0; i < SubTable->RegisterCount; i++) + { + ArrayOffset = SubTable->AddressSizeOffset + + (sizeof (UINT32) * i); + AbsoluteOffset = Offset + ArrayOffset; + Array = (UINT8 *) SubTable + ArrayOffset; + + Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array, + SubTable->Length, AcpiDmTableInfoDbg2Size); + if (ACPI_FAILURE (Status)) + { + return; + } + } + + /* Dump the Namestring (required) */ + + AcpiOsPrintf ("\n"); + ArrayOffset = SubTable->NamepathOffset; + AbsoluteOffset = Offset + ArrayOffset; + Array = (UINT8 *) SubTable + ArrayOffset; + + Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array, + SubTable->Length, AcpiDmTableInfoDbg2Name); + if (ACPI_FAILURE (Status)) + { + return; + } + + /* Dump the OemData (optional) */ + + AcpiDmDumpBuffer (SubTable, SubTable->OemDataOffset, SubTable->OemDataLength, + Offset + SubTable->OemDataOffset, "OEM Data"); + + /* Point to next sub-table */ + + Offset += SubTable->Length; + SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, SubTable, + SubTable->Length); + } +} + + +/******************************************************************************* + * * FUNCTION: AcpiDmDumpDmar * * PARAMETERS: Table - A DMAR table @@ -540,6 +810,7 @@ AcpiDmDumpCpep ( * ******************************************************************************/ + void AcpiDmDumpDmar ( ACPI_TABLE_HEADER *Table) Modified: vendor-sys/acpica/dist/source/common/dmtbinfo.c ============================================================================== --- vendor-sys/acpica/dist/source/common/dmtbinfo.c Thu Aug 16 17:17:08 2012 (r239331) +++ vendor-sys/acpica/dist/source/common/dmtbinfo.c Thu Aug 16 17:26:22 2012 (r239332) @@ -86,6 +86,7 @@ #define ACPI_BGRT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_BGRT,f) #define ACPI_BOOT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_BOOT,f) #define ACPI_CPEP_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_CPEP,f) +#define ACPI_DBG2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_DBG2,f) #define ACPI_DBGP_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_DBGP,f) #define ACPI_DMAR_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_DMAR,f) #define ACPI_DRTM_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_DRTM,f) @@ -126,6 +127,9 @@ #define ACPI_ASF3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_RMCP,f) #define ACPI_ASF4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ADDRESS,f) #define ACPI_CPEP0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CPEP_POLLING,f) +#define ACPI_CSRT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CSRT_GROUP,f) +#define ACPI_CSRT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CSRT_DESCRIPTOR,f) +#define ACPI_DBG20_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DBG2_DEVICE,f) #define ACPI_DMARS_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_DEVICE_SCOPE,f) #define ACPI_DMAR0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_HARDWARE_UNIT,f) #define ACPI_DMAR1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_RESERVED_MEMORY,f) @@ -641,6 +645,94 @@ ACPI_DMTABLE_INFO AcpiDmTableI /******************************************************************************* * + * CSRT - Core System Resource Table + * + ******************************************************************************/ + +/* Main table consists only of the standard ACPI table header */ + +/* Resource Group subtable */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoCsrt0[] = +{ + {ACPI_DMT_UINT32, ACPI_CSRT0_OFFSET (Length), "Length", 0}, + {ACPI_DMT_UINT32, ACPI_CSRT0_OFFSET (VendorId), "Vendor ID", 0}, + {ACPI_DMT_UINT32, ACPI_CSRT0_OFFSET (SubvendorId), "Subvendor ID", 0}, + {ACPI_DMT_UINT16, ACPI_CSRT0_OFFSET (DeviceId), "Device ID", 0}, + {ACPI_DMT_UINT16, ACPI_CSRT0_OFFSET (SubdeviceId), "Subdevice ID", 0}, + {ACPI_DMT_UINT16, ACPI_CSRT0_OFFSET (Revision), "Revision", 0}, + {ACPI_DMT_UINT16, ACPI_CSRT0_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_CSRT0_OFFSET (InfoLength), "InfoLength", 0}, + ACPI_DMT_TERMINATOR +}; + +/* Resource Descriptor subtable */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoCsrt1[] = +{ + {ACPI_DMT_UINT32, ACPI_CSRT1_OFFSET (Length), "Length", 0}, + {ACPI_DMT_UINT16, ACPI_CSRT1_OFFSET (Type), "Type", 0}, + {ACPI_DMT_UINT16, ACPI_CSRT1_OFFSET (Subtype), "Subtype", 0}, + {ACPI_DMT_UINT32, ACPI_CSRT1_OFFSET (Uid), "UID", 0}, + ACPI_DMT_TERMINATOR +}; + + +/******************************************************************************* + * + * DBG2 - Debug Port Table 2 + * + ******************************************************************************/ + +ACPI_DMTABLE_INFO AcpiDmTableInfoDbg2[] = +{ + {ACPI_DMT_UINT32, ACPI_DBG2_OFFSET (InfoOffset), "Info Offset", 0}, + {ACPI_DMT_UINT32, ACPI_DBG2_OFFSET (InfoCount), "Info Count", 0}, + ACPI_DMT_TERMINATOR +}; + +/* Debug Device Information Subtable */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoDbg2Device[] = +{ + {ACPI_DMT_UINT8, ACPI_DBG20_OFFSET (Revision), "Revision", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (Length), "Length", 0}, + {ACPI_DMT_UINT8, ACPI_DBG20_OFFSET (RegisterCount), "Register Count", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (NamepathLength), "Namepath Length", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (NamepathOffset), "Namepath Offset", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (OemDataLength), "OEM Data Length", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (OemDataOffset), "OEM Data Offset", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (PortType), "Port Type", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (PortSubtype), "Port Subtype", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (BaseAddressOffset), "Base Address Offset", 0}, + {ACPI_DMT_UINT16, ACPI_DBG20_OFFSET (AddressSizeOffset), "Address Size Offset", 0}, + ACPI_DMT_TERMINATOR +}; + +/* Variable-length data for the subtable */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoDbg2Addr[] = +{ + {ACPI_DMT_GAS, 0, "Base Address Register", 0}, + ACPI_DMT_TERMINATOR +}; + +ACPI_DMTABLE_INFO AcpiDmTableInfoDbg2Size[] = +{ + {ACPI_DMT_UINT32, 0, "Address Size", 0}, + ACPI_DMT_TERMINATOR +}; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***