Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica/dist resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/382b15a80684
branches: trunk
changeset: 792243:382b15a80684
user: christos <christos%NetBSD.org@localhost>
date: Fri Dec 27 18:50:56 2013 +0000
description:
resolve conflicts
diffstat:
sys/external/bsd/acpica/dist/README | 137 --
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 779 ++++++++++-
sys/external/bsd/acpica/dist/compiler/Makefile | 672 ----------
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 375 ++++-
sys/external/bsd/acpica/dist/compiler/asltree.c | 197 ++-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 296 +++-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 838 +++++++++---
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 210 ++-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 509 +------
sys/external/bsd/acpica/dist/debugger/dbinput.c | 437 +++++-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 37 +-
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 33 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl.c | 71 +-
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 16 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 20 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 9 +-
sys/external/bsd/acpica/dist/events/evxface.c | 870 +++++++-----
sys/external/bsd/acpica/dist/executer/exconfig.c | 30 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 12 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 89 +-
sys/external/bsd/acpica/dist/hardware/hwesleep.c | 6 +-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 6 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 2 +-
sys/external/bsd/acpica/dist/include/acapps.h | 22 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 84 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 286 +++-
sys/external/bsd/acpica/dist/include/acexcep.h | 4 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 120 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 8 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 183 ++-
sys/external/bsd/acpica/dist/include/acmacros.h | 249 +--
sys/external/bsd/acpica/dist/include/acnamesp.h | 115 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 158 ++-
sys/external/bsd/acpica/dist/include/acpixf.h | 307 +++-
sys/external/bsd/acpica/dist/include/acresrc.h | 130 +-
sys/external/bsd/acpica/dist/include/actables.h | 20 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 115 +-
sys/external/bsd/acpica/dist/include/actypes.h | 194 ++-
sys/external/bsd/acpica/dist/include/acutils.h | 304 +++-
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 4 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 15 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 214 ++-
sys/external/bsd/acpica/dist/namespace/nseval.c | 253 ++-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 43 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 396 ++++-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 256 ++-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 85 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 197 +--
sys/external/bsd/acpica/dist/parser/psopinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 329 +---
sys/external/bsd/acpica/dist/resources/rsutils.c | 76 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 168 ++-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 418 +++--
sys/external/bsd/acpica/dist/tables/tbinstal.c | 4 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 477 +++----
sys/external/bsd/acpica/dist/tables/tbxface.c | 238 +---
sys/external/bsd/acpica/dist/tables/tbxfroot.c | 27 +-
sys/external/bsd/acpica/dist/tools/acpibin/Makefile | 139 --
sys/external/bsd/acpica/dist/tools/acpiexec/Makefile | 690 ----------
sys/external/bsd/acpica/dist/tools/acpihelp/Makefile | 101 -
sys/external/bsd/acpica/dist/tools/acpihelp/ahpredef.c | 277 ----
sys/external/bsd/acpica/dist/tools/acpinames/Makefile | 334 -----
sys/external/bsd/acpica/dist/tools/acpisrc/Makefile | 113 -
sys/external/bsd/acpica/dist/tools/acpixtract/Makefile | 73 -
sys/external/bsd/acpica/dist/utilities/utcache.c | 34 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 353 +---
sys/external/bsd/acpica/dist/utilities/utdecode.c | 97 +-
sys/external/bsd/acpica/dist/utilities/uteval.c | 18 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 34 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 968 +-------------
sys/external/bsd/acpica/dist/utilities/utmutex.c | 37 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 144 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 174 +-
73 files changed, 7192 insertions(+), 7546 deletions(-)
diffs (truncated from 23420 to 300 lines):
diff -r 3af43ca1e451 -r 382b15a80684 sys/external/bsd/acpica/dist/README
--- a/sys/external/bsd/acpica/dist/README Fri Dec 27 18:45:57 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-Makefiles for tool generation from the unix tarball
----------------------------------------------------
-
-These makefiles are intended to generate the ACPICA utilities in
-a Linux or Unix-like environment, from the ACPICA source code
-as released in the unix tarball.
-
-Windows binary versions of these tools are available at:
-
-http://www.acpica.org/downloads/binary_tools.php
-
-Documentation is available at acpica.org:
-
-http://www.acpica.org/documentation/
-
-The acpica/source/tools directory contains the following utilities.
-Note: These utilities are tested and supported as 32-bit versions
-only.
-
-acpibin
-acpiexec
-acpihelp
-acpinames
-acpisrc
-acpixtract
-iasl
-
-
-Requirements
-------------
-
-make
-gcc compiler (4+)
-bison or yacc
-flex or lex
-
-
-Configuration
--------------
-
-The Makefiles contain this configuration information:
-
-HOST = _LINUX /* Host system, must appear in acenv.h */
-CC = gcc /* C compiler */
-
-
-1) acpibin, an AML file tool
-
-acpibin compares AML files, dumps AML binary files to text files,
-extracts binary AML from text files, and other AML file
-manipulation.
-
-To compile:
-
-cd acpica/source/tools/acpibin
-make
-make install /* install the binary to /usr/bin */
-
-
-2) acpiexec, a user-space AML interpreter
-
-acpiexec allows the loading of ACPI tables and execution of control
-methods from user space. Useful for debugging AML code and testing
-the AML interpreter. Hardware access is simulated.
-
-To compile:
-
-cd acpica/source/tools/acpiexec
-make
-make install /* install the binary to /usr/bin */
-
-
-3) acpihelp, syntax help for ASL operators and reserved names
-
-acpihelp displays the syntax for all of the ASL operators, as well
-as information about the ASL/ACPI reserved names (4-char names that
-start with underscore.)
-
-To compile:
-
-cd acpica/source/tools/acpihelp
-make
-make install /* install the binary to /usr/bin */
-
-
-4) acpinames, load and dump acpi namespace
-
-acpinames loads an ACPI namespace from a binary ACPI table file.
-This is a smaller version of acpiexec that loads an acpi table and
-dumps the resulting namespace. It is primarily intended to demonstrate
-the configurability of ACPICA.
-
-To compile:
-
-cd acpica/source/tools/acpinames
-make
-make install /* install the binary to /usr/bin */
-
-
-5) acpisrc, a source code conversion tool
-
-acpisrc converts the standard form of the acpica source release (included
-here) into a version that meets Linux coding guidelines. This consists
-mainly of performing a series of string replacements and transformations
-to the code. It can also be used to clean the acpica source and generate
-statistics.
-
-To compile:
-
-cd acpica/source/tools/acpisrc
-make
-make install /* install the binary to /usr/bin */
-
-
-6) acpixtract, extract binary ACPI tables from an acpidump
-
-acpixtract is used to extract binary ACPI tables from the ASCII text
-output of an acpidump utility (available on several different hosts.)
-
-To compile:
-
-cd acpica/source/tools/acpixtract
-make
-make install /* install the binary to /usr/bin */
-
-
-7) iasl, an optimizing ASL compiler/disassembler
-
-iasl compiles ASL (ACPI Source Language) into AML (ACPI Machine
-Language). This AML is suitable for inclusion as a DSDT in system
-firmware. It also can disassemble AML, for debugging purposes.
-
-To compile:
-
-cd acpica/source/compiler
-make
-make install /* install the binary to /usr/bin */
diff -r 3af43ca1e451 -r 382b15a80684 sys/external/bsd/acpica/dist/common/dmtbinfo.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c Fri Dec 27 18:45:57 2013 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c Fri Dec 27 18:50:56 2013 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2011, Intel Corp.
+ * Copyright (C) 2000 - 2013, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,97 +78,131 @@
/*
* Macros used to generate offsets to specific table fields
*/
-#define ACPI_FACS_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_FACS,f)
-#define ACPI_GAS_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_GENERIC_ADDRESS,f)
-#define ACPI_HDR_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_HEADER,f)
-#define ACPI_RSDP_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_RSDP,f)
-#define ACPI_BOOT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_BOOT,f)
-#define ACPI_BERT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_BERT,f)
-#define ACPI_CPEP_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_CPEP,f)
-#define ACPI_DBGP_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_DBGP,f)
-#define ACPI_DMAR_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_DMAR,f)
-#define ACPI_ECDT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_ECDT,f)
-#define ACPI_EINJ_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_EINJ,f)
-#define ACPI_ERST_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_ERST,f)
-#define ACPI_HEST_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_HEST,f)
-#define ACPI_HPET_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_HPET,f)
-#define ACPI_IVRS_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_IVRS,f)
-#define ACPI_MADT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_MADT,f)
-#define ACPI_MCFG_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_MCFG,f)
-#define ACPI_MCHI_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_MCHI,f)
-#define ACPI_MSCT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_MSCT,f)
-#define ACPI_SBST_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_SBST,f)
-#define ACPI_SLIT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_SLIT,f)
-#define ACPI_SPCR_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_SPCR,f)
-#define ACPI_SPMI_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_SPMI,f)
-#define ACPI_SRAT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_SRAT,f)
-#define ACPI_TCPA_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_TCPA,f)
-#define ACPI_UEFI_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_UEFI,f)
-#define ACPI_WAET_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_WAET,f)
-#define ACPI_WDAT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_WDAT,f)
-#define ACPI_WDDT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_WDDT,f)
-#define ACPI_WDRT_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_TABLE_WDRT,f)
+#define ACPI_FACS_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_FACS,f)
+#define ACPI_GAS_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GENERIC_ADDRESS,f)
+#define ACPI_HDR_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_HEADER,f)
+#define ACPI_RSDP_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_RSDP,f)
+#define ACPI_BERT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_BERT,f)
+#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)
+#define ACPI_ECDT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_ECDT,f)
+#define ACPI_EINJ_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_EINJ,f)
+#define ACPI_ERST_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_ERST,f)
+#define ACPI_GTDT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_GTDT,f)
+#define ACPI_HEST_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_HEST,f)
+#define ACPI_HPET_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_HPET,f)
+#define ACPI_IVRS_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_IVRS,f)
+#define ACPI_MADT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_MADT,f)
+#define ACPI_MCFG_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_MCFG,f)
+#define ACPI_MCHI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_MCHI,f)
+#define ACPI_MPST_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_MPST,f)
+#define ACPI_MSCT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_MSCT,f)
+#define ACPI_PCCT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_PCCT,f)
+#define ACPI_PMTT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_PMTT,f)
+#define ACPI_S3PT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_S3PT,f)
+#define ACPI_SBST_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SBST,f)
+#define ACPI_SLIT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SLIT,f)
+#define ACPI_SPCR_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SPCR,f)
+#define ACPI_SPMI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SPMI,f)
+#define ACPI_SRAT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_SRAT,f)
+#define ACPI_TCPA_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA,f)
+#define ACPI_TPM2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TPM2,f)
+#define ACPI_UEFI_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_UEFI,f)
+#define ACPI_WAET_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WAET,f)
+#define ACPI_WDAT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WDAT,f)
+#define ACPI_WDDT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WDDT,f)
+#define ACPI_WDRT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_WDRT,f)
/* Subtables */
-#define ACPI_ASF0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_ASF_INFO,f)
-#define ACPI_ASF1_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_ASF_ALERT,f)
-#define ACPI_ASF1a_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_ASF_ALERT_DATA,f)
-#define ACPI_ASF2_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_ASF_REMOTE,f)
-#define ACPI_ASF2a_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_ASF_CONTROL_DATA,f)
-#define ACPI_ASF3_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_ASF_RMCP,f)
-#define ACPI_ASF4_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_ASF_ADDRESS,f)
-#define ACPI_CPEP0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_CPEP_POLLING,f)
-#define ACPI_DMARS_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_DMAR_DEVICE_SCOPE,f)
-#define ACPI_DMAR0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_DMAR_HARDWARE_UNIT,f)
-#define ACPI_DMAR1_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_DMAR_RESERVED_MEMORY,f)
-#define ACPI_DMAR2_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_DMAR_ATSR,f)
-#define ACPI_DMAR3_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_DMAR_RHSA,f)
-#define ACPI_EINJ0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_WHEA_HEADER,f)
-#define ACPI_ERST0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_WHEA_HEADER,f)
-#define ACPI_HEST0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_IA_MACHINE_CHECK,f)
-#define ACPI_HEST1_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_IA_CORRECTED,f)
-#define ACPI_HEST2_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_IA_NMI,f)
-#define ACPI_HEST6_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_AER_ROOT,f)
-#define ACPI_HEST7_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_AER,f)
-#define ACPI_HEST8_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_AER_BRIDGE,f)
-#define ACPI_HEST9_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_GENERIC,f)
-#define ACPI_HESTN_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_NOTIFY,f)
-#define ACPI_HESTB_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_HEST_IA_ERROR_BANK,f)
-#define ACPI_IVRSH_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_IVRS_HEADER,f)
-#define ACPI_IVRS0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_IVRS_HARDWARE,f)
-#define ACPI_IVRS1_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_IVRS_MEMORY,f)
-#define ACPI_IVRSD_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_IVRS_DE_HEADER,f)
-#define ACPI_IVRS8A_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_IVRS_DEVICE8A,f)
-#define ACPI_IVRS8B_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_IVRS_DEVICE8B,f)
-#define ACPI_IVRS8C_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_IVRS_DEVICE8C,f)
-#define ACPI_MADT0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_LOCAL_APIC,f)
-#define ACPI_MADT1_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_IO_APIC,f)
-#define ACPI_MADT2_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_INTERRUPT_OVERRIDE,f)
-#define ACPI_MADT3_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_NMI_SOURCE,f)
-#define ACPI_MADT4_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_LOCAL_APIC_NMI,f)
-#define ACPI_MADT5_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_LOCAL_APIC_OVERRIDE,f)
-#define ACPI_MADT6_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_IO_SAPIC,f)
-#define ACPI_MADT7_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_LOCAL_SAPIC,f)
-#define ACPI_MADT8_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_INTERRUPT_SOURCE,f)
-#define ACPI_MADT9_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_LOCAL_X2APIC,f)
-#define ACPI_MADT10_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MADT_LOCAL_X2APIC_NMI,f)
-#define ACPI_MADTH_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f)
-#define ACPI_MCFG0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MCFG_ALLOCATION,f)
-#define ACPI_MSCT0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_MSCT_PROXIMITY,f)
-#define ACPI_SLICH_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SLIC_HEADER,f)
-#define ACPI_SLIC0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SLIC_KEY,f)
-#define ACPI_SLIC1_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SLIC_MARKER,f)
-#define ACPI_SRATH_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f)
-#define ACPI_SRAT0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SRAT_CPU_AFFINITY,f)
-#define ACPI_SRAT1_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SRAT_MEM_AFFINITY,f)
-#define ACPI_SRAT2_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_SRAT_X2APIC_CPU_AFFINITY,f)
-#define ACPI_WDAT0_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_WDAT_ENTRY,f)
+#define ACPI_ASF0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_INFO,f)
+#define ACPI_ASF1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ALERT,f)
+#define ACPI_ASF1a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ALERT_DATA,f)
+#define ACPI_ASF2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_REMOTE,f)
+#define ACPI_ASF2a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_CONTROL_DATA,f)
+#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_SHARED_INFO,f)
+#define ACPI_CSRT2_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)
+#define ACPI_DMAR2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_ATSR,f)
+#define ACPI_DMAR3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_RHSA,f)
+#define ACPI_EINJ0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WHEA_HEADER,f)
Home |
Main Index |
Thread Index |
Old Index