clean up AlertStandardFormatTable.h.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6194 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
index f397666acd39e433dfee498ed912b67e48fc1a95..ebf0e7609ba5e01cd872ffff26171ed7dfa81819 100644 (file)
--- a/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
+++ b/MdePkg/Include/IndustryStandard/AlertStandardFormatTable.h
@@ -1,7 +1,7 @@
 /** @file   \r
        ACPI Alert Standard Format Description Table ASF! as described in the ASF2.0 Specification\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
+  Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -45,31 +45,61 @@ typedef struct {
 } EFI_ACPI_ASF_INFO;\r
 \r
 ///\r
-/// Alert sensors definition\r
+/// ASF Alert Data\r
 ///\r
-#define ASF_ALRT_SENSOR_ARRAY_LENGTH     36\r
+typedef struct {\r
+  UINT8                                DeviceAddress;\r
+  UINT8                                Command;\r
+  UINT8                                DataMask;\r
+  UINT8                                CompareValue;\r
+  UINT8                                EventSenseType;\r
+  UINT8                                EventType;\r
+  UINT8                                EventOffset;\r
+  UINT8                                EventSourceType;\r
+  UINT8                                EventSeverity;\r
+  UINT8                                SensorNumber;\r
+  UINT8                                Entity;\r
+  UINT8                                EntityInstance;\r
+} EFI_ACPI_ASF_ALERTDATA;\r
 \r
+///\r
+/// Alert sensors definition\r
+///\r
 typedef struct {\r
   EFI_ACPI_ASF_RECORD_HEADER           RecordHeader;\r
   UINT8                                AssertionEventBitMask;\r
   UINT8                                DeassertionEventBitMask;\r
   UINT8                                NumberOfAlerts;\r
-  UINT8                                ArrayElementLength;\r
-  UINT8                                DeviceArray[ASF_ALRT_SENSOR_ARRAY_LENGTH];\r
+  UINT8                                ArrayElementLength; ///< For ASF version 1.0 and later, this filed is set to 0x0C\r
+  ///\r
+  /// EFI_ACPI_ASF_ALERTDATA           DeviceArray[ANYSIZE_ARRAY];\r
+  ///\r
 } EFI_ACPI_ASF_ALRT;\r
 \r
+///\r
+/// Alert Control Data\r
+///\r
+typedef struct {\r
+  UINT8                                Function;\r
+  UINT8                                DeviceAddress;\r
+  UINT8                                Command;\r
+  UINT8                                DataValue;\r
+} EFI_ACPI_ASF_CONTROLDATA;       \r
+\r
 ///\r
 /// Alert Remote Control System Actions\r
 ///\r
-#define ASF_RCTL_DEVICES_ARRAY_LENGTH      16  \r
 typedef struct {\r
   EFI_ACPI_ASF_RECORD_HEADER           RecordHeader;\r
   UINT8                                NumberOfControls;\r
-  UINT8                                ArrayElementLength;\r
+  UINT8                                ArrayElementLength; ///< For ASF version 1.0 and later, this filed is set to 0x4\r
   UINT16                               RctlReserved;\r
-  UINT8                                ControlArray[ASF_RCTL_DEVICES_ARRAY_LENGTH];\r
+  ///\r
+  /// EFI_ACPI_ASF_CONTROLDATA;        DeviceArray[ANYSIZE_ARRAY];\r
+  ///\r
 } EFI_ACPI_ASF_RCTL;\r
 \r
+\r
 ///\r
 /// Remote Control Capabilities\r
 ///\r
@@ -87,27 +117,29 @@ typedef struct {
 ///\r
 /// SMBus Devices with fixed addresses\r
 ///\r
-#define ASF_ADDR_DEVICE_ARRAY_LENGTH      16  \r
 typedef struct {\r
   EFI_ACPI_ASF_RECORD_HEADER           RecordHeader;\r
   UINT8                                SEEPROMAddress;\r
   UINT8                                NumberOfDevices;\r
-  UINT8                                FixedSmbusAddresses[ASF_ADDR_DEVICE_ARRAY_LENGTH];\r
+  ///\r
+  /// UINT8                            FixedSmbusAddresses[ANYSIZE_ARRAY];\r
+  ///\r
 } EFI_ACPI_ASF_ADDR;\r
 \r
-typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER          Header;\r
-  EFI_ACPI_ASF_INFO                    AsfInfo;\r
-  EFI_ACPI_ASF_ALRT                    AsfAlert;\r
-  EFI_ACPI_ASF_RCTL                    AsfRctl;\r
-  EFI_ACPI_ASF_RMCP                    AsfRmcp;\r
-  EFI_ACPI_ASF_ADDR                    AsfAddr;\r
-} EFI_ACPI_1_0_ASF_DESCRIPTION_TABLE;\r
+///\r
+/// ASF! Description Table Header\r
+///\r
+typedef EFI_ACPI_DESCRIPTION_HEADER EFI_ACPI_ASF_DESCRIPTION_HEADER;\r
+\r
+///\r
+/// The revision stored in ASF! DESCRIPTION TABLE as BCD value\r
+///\r
+#define EFI_ACPI_2_0_ASF_DESCRIPTION_TABLE_REVISION   0x20\r
 \r
 ///\r
 /// "ASF!" ASF Description Table Signature\r
 ///\r
-#define EFI_ACPI_1_0_ASF_DESCRIPTION_TABLE_SIGNATURE  0x21465341\r
+#define EFI_ACPI_ASF_DESCRIPTION_TABLE_SIGNATURE  EFI_SIGNATURE_32 ('A', 'S', 'F', '!')\r
 \r
 #pragma pack ()\r
 \r