Skip to content

Commit

Permalink
ACPICA: Split large ACPI table header
Browse files Browse the repository at this point in the history
Split out the non-acpi-defined ACPI tables into the existing
(but empty) actbl2.h file. Preparation for new ACPI 4.0 tables.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
acpibob authored and lenb committed Aug 28, 2009
1 parent 2f977b3 commit b24aad4
Show file tree
Hide file tree
Showing 3 changed files with 611 additions and 562 deletions.
35 changes: 23 additions & 12 deletions include/acpi/actbl.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,19 @@
#ifndef __ACTBL_H__
#define __ACTBL_H__

/*******************************************************************************
*
* Fundamental ACPI tables
*
* This file contains definitions for the ACPI tables that are directly consumed
* by ACPICA. All other tables are consumed by the OS-dependent ACPI-related
* device drivers and other OS support code.
*
* The RSDP and FACS do not use the common ACPI table header. All other ACPI
* tables use the header.
*
******************************************************************************/

/*
* Values for description table header signatures. Useful because they make
* it more difficult to inadvertently type in the wrong signature.
Expand All @@ -65,21 +78,15 @@
#pragma pack(1)

/*
* These are the ACPI tables that are directly consumed by the subsystem.
*
* The RSDP and FACS do not use the common ACPI table header. All other ACPI
* tables use the header.
*
* Note about bitfields: The u8 type is used for bitfields in ACPI tables.
* This is the only type that is even remotely portable. Anything else is not
* portable, so do not use any other bitfield types.
*/

/*******************************************************************************
*
* ACPI Table Header. This common header is used by all tables except the
* RSDP and FACS. The define is used for direct inclusion of header into
* other ACPI tables
* Master ACPI Table Header. This common header is used by all ACPI tables
* except the RSDP and FACS.
*
******************************************************************************/

Expand All @@ -95,13 +102,16 @@ struct acpi_table_header {
u32 asl_compiler_revision; /* ASL compiler version */
};

/*
/*******************************************************************************
*
* GAS - Generic Address Structure (ACPI 2.0+)
*
* Note: Since this structure is used in the ACPI tables, it is byte aligned.
* If misalignment is not supported, access to the Address field must be
* performed with care.
*/
* If misaliged access is not supported by the hardware, accesses to the
* 64-bit Address field must be performed with care.
*
******************************************************************************/

struct acpi_generic_address {
u8 space_id; /* Address space where struct or register exists */
u8 bit_width; /* Size in bits of given register */
Expand Down Expand Up @@ -325,5 +335,6 @@ struct acpi_table_desc {
*/

#include <acpi/actbl1.h>
#include <acpi/actbl2.h>

#endif /* __ACTBL_H__ */
Loading

0 comments on commit b24aad4

Please sign in to comment.