Move those status code definitions that exactly match the PI 1.2 Specification from...

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

diff --git a/IntelFrameworkPkg/Include/Framework/StatusCode.h b/IntelFrameworkPkg/Include/Framework/StatusCode.h
index 30fde7b0bc4ae8ab75b77998fec45f6ce5ab07c3..440bf09d0cb8b3a38c7c4847838947098ccd9d0b 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/StatusCode.h
+++ b/IntelFrameworkPkg/Include/Framework/StatusCode.h
@@ -2,18 +2,6 @@
   Status Code Definitions, according to Intel Platform Innovation Framework\r
   for EFI Status Codes Specification\r
 \r
   Status Code Definitions, according to Intel Platform Innovation Framework\r
   for EFI Status Codes Specification\r
 \r

-  The file is divided into sections for ease of use.\r
-\r
-<pre>\r
-  Section:    Contents:\r
-  1           Class definitions\r
-  2           Computing Unit Subclasses, Progress and Error Codes\r
-  3           Peripheral Subclasses, Progress and Error Codes.\r
-  4           IO Bus Subclasses, Progress and Error Codes.\r
-  5           Software Subclasses, Progress and Error Codes.\r
-  6           Debug Codes\r
-</pre>\r
-\r

   Copyright (c) 2007, 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
   Copyright (c) 2007, 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


@@ -29,593 +17,20 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#ifndef _STATUS_CODE_H_\r
-#define _STATUS_CODE_H_\r
-\r
-#include <Protocol/DebugSupport.h>\r
-///\r
-/// Section 1\r
-/// Class definitions\r
-/// Values of 4-127 are reserved for future use by this\r
-/// specification.\r
-/// Values in the range 127-255 are reserved for OEM use.\r
-///@{\r
-#define EFI_COMPUTING_UNIT  0x00000000\r
-#define EFI_PERIPHERAL      0x01000000\r
-#define EFI_IO_BUS          0x02000000\r
-#define EFI_SOFTWARE        0x03000000\r
-///@}\r
-\r
-///\r
-/// General partitioning scheme for Progress and Error Codes are\r
-/// 0x0000-0x0FFF  - Shared by all sub-classes in a given class\r
-/// 0x1000-0x7FFF  - Subclass Specific\r
-/// 0x8000-0xFFFF  - OEM specific\r
-///@{\r
-#define EFI_SUBCLASS_SPECIFIC 0x1000\r
-#define EFI_OEM_SPECIFIC      0x8000\r
-///@}\r
-\r
-/// \r
-/// Section 2\r
-/// Computing Unit Subclass definitions.\r
-/// Values of 8-127 are reserved for future use by this\r
-/// specification.\r
-/// Values of 128-255 are reserved for OEM use.\r
-///@{\r
-#define EFI_COMPUTING_UNIT_UNSPECIFIED        (EFI_COMPUTING_UNIT | 0x00000000)\r
-#define EFI_COMPUTING_UNIT_HOST_PROCESSOR     (EFI_COMPUTING_UNIT | 0x00010000)\r
-#define EFI_COMPUTING_UNIT_FIRMWARE_PROCESSOR (EFI_COMPUTING_UNIT | 0x00020000)\r
-#define EFI_COMPUTING_UNIT_IO_PROCESSOR       (EFI_COMPUTING_UNIT | 0x00030000)\r
-#define EFI_COMPUTING_UNIT_CACHE              (EFI_COMPUTING_UNIT | 0x00040000)\r
-#define EFI_COMPUTING_UNIT_MEMORY             (EFI_COMPUTING_UNIT | 0x00050000)\r
-#define EFI_COMPUTING_UNIT_CHIPSET            (EFI_COMPUTING_UNIT | 0x00060000)\r
-///@}\r
-\r
-///\r
-/// Computing Unit Class Progress Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_CU_PC_INIT_BEGIN  0x00000000\r
-#define EFI_CU_PC_INIT_END    0x00000001\r
-///@}\r
-\r
-///\r
-/// The reason that the processor was disabled.\r
-///@{\r
-#define EFI_CPU_CAUSE_NOT_DISABLED              0x0000\r
-#define EFI_CPU_CAUSE_INTERNAL_ERROR            0x0001\r
-#define EFI_CPU_CAUSE_THERMAL_ERROR             0x0002\r
-#define EFI_CPU_CAUSE_SELFTEST_FAILURE          0x0004\r
-#define EFI_CPU_CAUSE_PREBOOT_TIMEOUT           0x0008\r
-#define EFI_CPU_CAUSE_FAILED_TO_START           0x0010\r
-#define EFI_CPU_CAUSE_CONFIG_ERROR              0x0020\r
-#define EFI_CPU_CAUSE_USER_SELECTION            0x0080\r
-#define EFI_CPU_CAUSE_BY_ASSOCIATION            0x0100\r
-#define EFI_CPU_CAUSE_UNSPECIFIED               0x8000\r
-///@}\r
-\r
-typedef UINT32                                  EFI_CPU_STATE_CHANGE_CAUSE;\r
-//\r
-// Computing Unit Unspecified Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Computing Unit Host Processor Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_CU_HP_PC_POWER_ON_INIT          (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_CU_HP_PC_CACHE_INIT             (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_CU_HP_PC_RAM_INIT               (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_CU_HP_PC_MEMORY_CONTROLLER_INIT (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_CU_HP_PC_IO_INIT                (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_CU_HP_PC_BSP_SELECT             (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_CU_HP_PC_BSP_RESELECT           (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-#define EFI_CU_HP_PC_AP_INIT                (EFI_SUBCLASS_SPECIFIC | 0x00000007)\r
-#define EFI_CU_HP_PC_SMM_INIT               (EFI_SUBCLASS_SPECIFIC | 0x00000008)\r
-///@}\r
-\r
-//\r
-// Computing Unit Firmware Processor Subclass Progress Code definitions.\r
-//\r
-//\r
-// Computing Unit IO Processor Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Computing Unit Cache Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_CU_CACHE_PC_PRESENCE_DETECT (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_CU_CACHE_PC_CONFIGURATION   (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-///\r
-/// Computing Unit Memory Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_CU_MEMORY_PC_SPD_READ         (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_CU_MEMORY_PC_PRESENCE_DETECT  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_CU_MEMORY_PC_TIMING           (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_CU_MEMORY_PC_CONFIGURING      (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_CU_MEMORY_PC_OPTIMIZING       (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_CU_MEMORY_PC_INIT             (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_CU_MEMORY_PC_TEST             (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-///@}\r
-\r
-//\r
-// Computing Unit Chipset Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Computing Unit Class Error Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_CU_EC_NON_SPECIFIC    0x00000000\r
-#define EFI_CU_EC_DISABLED        0x00000001\r
-#define EFI_CU_EC_NOT_SUPPORTED   0x00000002\r
-#define EFI_CU_EC_NOT_DETECTED    0x00000003\r
-#define EFI_CU_EC_NOT_CONFIGURED  0x00000004\r
-///@}\r
-\r
-//\r
-// Computing Unit Unspecified Subclass Error Code definitions.\r
-//\r
-///\r
-/// Computing Unit Host Processor Subclass Error Code definitions.\r
-///@{\r
-#define EFI_CU_HP_EC_INVALID_TYPE         (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_CU_HP_EC_INVALID_SPEED        (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_CU_HP_EC_MISMATCH             (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_CU_HP_EC_TIMER_EXPIRED        (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_CU_HP_EC_SELF_TEST            (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_CU_HP_EC_INTERNAL             (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_CU_HP_EC_THERMAL              (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-#define EFI_CU_HP_EC_LOW_VOLTAGE          (EFI_SUBCLASS_SPECIFIC | 0x00000007)\r
-#define EFI_CU_HP_EC_HIGH_VOLTAGE         (EFI_SUBCLASS_SPECIFIC | 0x00000008)\r
-#define EFI_CU_HP_EC_CACHE                (EFI_SUBCLASS_SPECIFIC | 0x00000009)\r
-#define EFI_CU_HP_EC_MICROCODE_UPDATE     (EFI_SUBCLASS_SPECIFIC | 0x0000000A)\r
-#define EFI_CU_HP_EC_CORRECTABLE          (EFI_SUBCLASS_SPECIFIC | 0x0000000B)\r
-#define EFI_CU_HP_EC_UNCORRECTABLE        (EFI_SUBCLASS_SPECIFIC | 0x0000000C)\r
-#define EFI_CU_HP_EC_NO_MICROCODE_UPDATE  (EFI_SUBCLASS_SPECIFIC | 0x0000000D)\r
-///@}\r
-\r
-///\r
-/// Computing Unit Firmware Processor Subclass Error Code definitions.\r
-///@{\r
-#define EFI_CU_FP_EC_HARD_FAIL  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_CU_FP_EC_SOFT_FAIL  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_CU_FP_EC_COMM_ERROR (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-///@}\r
-\r
-//\r
-// Computing Unit IO Processor Subclass Error Code definitions.\r
-//\r
-///\r
-/// Computing Unit Cache Subclass Error Code definitions.\r
-///@{\r
-#define EFI_CU_CACHE_EC_INVALID_TYPE  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_CU_CACHE_EC_INVALID_SPEED (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_CU_CACHE_EC_INVALID_SIZE  (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_CU_CACHE_EC_MISMATCH      (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-///@}\r
-\r
-///\r
-/// Computing Unit Memory Subclass Error Code definitions.\r
-///@{\r
-#define EFI_CU_MEMORY_EC_INVALID_TYPE   (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_CU_MEMORY_EC_INVALID_SPEED  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_CU_MEMORY_EC_CORRECTABLE    (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_CU_MEMORY_EC_UNCORRECTABLE  (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_CU_MEMORY_EC_SPD_FAIL       (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_CU_MEMORY_EC_INVALID_SIZE   (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_CU_MEMORY_EC_MISMATCH       (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-#define EFI_CU_MEMORY_EC_S3_RESUME_FAIL (EFI_SUBCLASS_SPECIFIC | 0x00000007)\r
-#define EFI_CU_MEMORY_EC_UPDATE_FAIL    (EFI_SUBCLASS_SPECIFIC | 0x00000008)\r
-#define EFI_CU_MEMORY_EC_NONE_DETECTED  (EFI_SUBCLASS_SPECIFIC | 0x00000009)\r
-#define EFI_CU_MEMORY_EC_NONE_USEFUL    (EFI_SUBCLASS_SPECIFIC | 0x0000000A)\r
-///@}\r
-\r
-//\r
-// Computing Unit Chipset Subclass Error Code definitions.\r
-//\r
-\r
-///\r
-/// Section 3\r
-/// Peripheral Subclass definitions.\r
-/// Values of 12-127 are reserved for future use by this\r
-/// specification.\r
-/// Values of 128-255 are reserved for OEM use.\r
-///@{\r
-#define EFI_PERIPHERAL_UNSPECIFIED      (EFI_PERIPHERAL | 0x00000000)\r
-#define EFI_PERIPHERAL_KEYBOARD         (EFI_PERIPHERAL | 0x00010000)\r
-#define EFI_PERIPHERAL_MOUSE            (EFI_PERIPHERAL | 0x00020000)\r
-#define EFI_PERIPHERAL_LOCAL_CONSOLE    (EFI_PERIPHERAL | 0x00030000)\r
-#define EFI_PERIPHERAL_REMOTE_CONSOLE   (EFI_PERIPHERAL | 0x00040000)\r
-#define EFI_PERIPHERAL_SERIAL_PORT      (EFI_PERIPHERAL | 0x00050000)\r
-#define EFI_PERIPHERAL_PARALLEL_PORT    (EFI_PERIPHERAL | 0x00060000)\r
-#define EFI_PERIPHERAL_FIXED_MEDIA      (EFI_PERIPHERAL | 0x00070000)\r
-#define EFI_PERIPHERAL_REMOVABLE_MEDIA  (EFI_PERIPHERAL | 0x00080000)\r
-#define EFI_PERIPHERAL_AUDIO_INPUT      (EFI_PERIPHERAL | 0x00090000)\r
-#define EFI_PERIPHERAL_AUDIO_OUTPUT     (EFI_PERIPHERAL | 0x000A0000)\r
-#define EFI_PERIPHERAL_LCD_DEVICE       (EFI_PERIPHERAL | 0x000B0000)\r
-#define EFI_PERIPHERAL_NETWORK          (EFI_PERIPHERAL | 0x000C0000)\r
-///@}\r
-\r
-///\r
-/// Peripheral Class Progress Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_P_PC_INIT             0x00000000\r
-#define EFI_P_PC_RESET            0x00000001\r
-#define EFI_P_PC_DISABLE          0x00000002\r
-#define EFI_P_PC_PRESENCE_DETECT  0x00000003\r
-#define EFI_P_PC_ENABLE           0x00000004\r
-#define EFI_P_PC_RECONFIG         0x00000005\r
-#define EFI_P_PC_DETECTED         0x00000006\r
-///@}\r
-\r
-//\r
-// Peripheral Class Unspecified Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Peripheral Class Keyboard Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_P_KEYBOARD_PC_CLEAR_BUFFER  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_P_KEYBOARD_PC_SELF_TEST     (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-//\r
-// Peripheral Class Mouse Subclass Progress Code definitions.\r
-//\r
-#define EFI_P_MOUSE_PC_SELF_TEST  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-\r
-//\r
-// Peripheral Class Local Console Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class Remote Console Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class Serial Port Subclass Progress Code definitions.\r
-//\r
-#define EFI_P_SERIAL_PORT_PC_CLEAR_BUFFER (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-\r
-//\r
-// Peripheral Class Parallel Port Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class Fixed Media Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class Removable Media Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class Audio Input Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class Audio Output Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class LCD Device Subclass Progress Code definitions.\r
-//\r
-//\r
-// Peripheral Class Network Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Peripheral Class Error Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_P_EC_NON_SPECIFIC       0x00000000\r
-#define EFI_P_EC_DISABLED           0x00000001\r
-#define EFI_P_EC_NOT_SUPPORTED      0x00000002\r
-#define EFI_P_EC_NOT_DETECTED       0x00000003\r
-#define EFI_P_EC_NOT_CONFIGURED     0x00000004\r
-#define EFI_P_EC_INTERFACE_ERROR    0x00000005\r
-#define EFI_P_EC_CONTROLLER_ERROR   0x00000006\r
-#define EFI_P_EC_INPUT_ERROR        0x00000007\r
-#define EFI_P_EC_OUTPUT_ERROR       0x00000008\r
-#define EFI_P_EC_RESOURCE_CONFLICT  0x00000009\r
-///@}\r
-\r
-//\r
-// Peripheral Class Unspecified Subclass Error Code definitions.\r
-//\r
-///\r
-/// Peripheral Class Keyboard Subclass Error Code definitions.\r
-///@{\r
-#define EFI_P_KEYBOARD_EC_LOCKED    (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_P_KEYBOARD_EC_STUCK_KEY (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-//\r
-// Peripheral Class Mouse Subclass Error Code definitions.\r
-//\r
-#define EFI_P_MOUSE_EC_LOCKED (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-\r
-//\r
-// Peripheral Class Local Console Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Remote Console Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Serial Port Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Parallel Port Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Fixed Media Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Removable Media Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Audio Input Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Audio Output Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class LCD Device Subclass Error Code definitions.\r
-//\r
-//\r
-// Peripheral Class Network Subclass Error Code definitions.\r
-//\r
-\r
-///\r
-/// Section 4\r
-/// IO Bus Subclass definitions.\r
-/// Values of 14-127 are reserved for future use by this\r
-/// specification.\r
-/// Values of 128-255 are reserved for OEM use.\r
-///@{\r
-#define EFI_IO_BUS_UNSPECIFIED  (EFI_IO_BUS | 0x00000000)\r
-#define EFI_IO_BUS_PCI          (EFI_IO_BUS | 0x00010000)\r
-#define EFI_IO_BUS_USB          (EFI_IO_BUS | 0x00020000)\r
-#define EFI_IO_BUS_IBA          (EFI_IO_BUS | 0x00030000)\r
-#define EFI_IO_BUS_AGP          (EFI_IO_BUS | 0x00040000)\r
-#define EFI_IO_BUS_PC_CARD      (EFI_IO_BUS | 0x00050000)\r
-#define EFI_IO_BUS_LPC          (EFI_IO_BUS | 0x00060000)\r
-#define EFI_IO_BUS_SCSI         (EFI_IO_BUS | 0x00070000)\r
-#define EFI_IO_BUS_ATA_ATAPI    (EFI_IO_BUS | 0x00080000)\r
-#define EFI_IO_BUS_FC           (EFI_IO_BUS | 0x00090000)\r
-#define EFI_IO_BUS_IP_NETWORK   (EFI_IO_BUS | 0x000A0000)\r
-#define EFI_IO_BUS_SMBUS        (EFI_IO_BUS | 0x000B0000)\r
-#define EFI_IO_BUS_I2C          (EFI_IO_BUS | 0x000C0000)\r
-///@}\r
-\r
-///\r
-/// IO Bus Class Progress Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_IOB_PC_INIT     0x00000000\r
-#define EFI_IOB_PC_RESET    0x00000001\r
-#define EFI_IOB_PC_DISABLE  0x00000002\r
-#define EFI_IOB_PC_DETECT   0x00000003\r
-#define EFI_IOB_PC_ENABLE   0x00000004\r
-#define EFI_IOB_PC_RECONFIG 0x00000005\r
-#define EFI_IOB_PC_HOTPLUG  0x00000006\r
-///@}\r
-\r
-//\r
-// IO Bus Class Unspecified Subclass Progress Code definitions.\r
-//\r
-///\r
-/// IO Bus Class PCI Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_IOB_PCI_PC_BUS_ENUM   (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_IOB_PCI_PC_RES_ALLOC  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_IOB_PCI_PC_HPC_INIT   (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-///@}\r
-\r
-//\r
-// IO Bus Class USB Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class IBA Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class AGP Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class PC Card Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class LPC Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class SCSI Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class ATA/ATAPI Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Inconsistent with specification here: \r
-/// The Framework Spec, StatusCodes0.92, does not define the macro. And the definition\r
-/// is expected to be adopt by PI Spec.\r
-///@{\r
-#define EFI_IOB_ATA_BUS_SMART_ENABLE          (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_IOB_ATA_BUS_SMART_DISABLE         (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD   (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD  (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-///@}\r
-\r
-//\r
-// IO Bus Class FC Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class IP Network Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class SMBUS Subclass Progress Code definitions.\r
-//\r
-//\r
-// IO Bus Class I2C Subclass Progress Code definitions.\r
-//\r
-///\r
-/// IO Bus Class Error Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_IOB_EC_NON_SPECIFIC       0x00000000\r
-#define EFI_IOB_EC_DISABLED           0x00000001\r
-#define EFI_IOB_EC_NOT_SUPPORTED      0x00000002\r
-#define EFI_IOB_EC_NOT_DETECTED       0x00000003\r
-#define EFI_IOB_EC_NOT_CONFIGURED     0x00000004\r
-#define EFI_IOB_EC_INTERFACE_ERROR    0x00000005\r
-#define EFI_IOB_EC_CONTROLLER_ERROR   0x00000006\r
-#define EFI_IOB_EC_READ_ERROR         0x00000007\r
-#define EFI_IOB_EC_WRITE_ERROR        0x00000008\r
-#define EFI_IOB_EC_RESOURCE_CONFLICT  0x00000009\r
-///@}\r
-\r
-//\r
-// IO Bus Class Unspecified Subclass Error Code definitions.\r
-//\r
-///\r
-/// IO Bus Class PCI Subclass Error Code definitions.\r
-///@{\r
-#define EFI_IOB_PCI_EC_PERR (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_IOB_PCI_EC_SERR (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-//\r
-// IO Bus Class USB Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class IBA Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class AGP Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class PC Card Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class LPC Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class SCSI Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class ATA/ATAPI Subclass Error Code definitions.\r
-//\r
-///\r
-/// Inconsistent with specification here: \r
-/// The Framework Spec, StatusCodes0.92, does not define the macro. And the definition\r
-/// is expected to be adopt by PI Spec.\r
-///@{\r
-#define EFI_IOB_ATA_BUS_SMART_NOTSUPPORTED  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_IOB_ATA_BUS_SMART_DISABLED      (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-//\r
-// IO Bus Class FC Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class IP Network Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class SMBUS Subclass Error Code definitions.\r
-//\r
-//\r
-// IO Bus Class I2C Subclass Error Code definitions.\r
-//\r
-\r
-///\r
-/// Section 5\r
-/// Software Subclass definitions.\r
-/// Values of 14-127 are reserved for future use by this\r
-/// specification.\r
-/// Values of 128-255 are reserved for OEM use.\r
-///@{\r
-#define EFI_SOFTWARE_UNSPECIFIED          (EFI_SOFTWARE | 0x00000000)\r
-#define EFI_SOFTWARE_SEC                  (EFI_SOFTWARE | 0x00010000)\r
-#define EFI_SOFTWARE_PEI_CORE             (EFI_SOFTWARE | 0x00020000)\r
-#define EFI_SOFTWARE_PEI_MODULE           (EFI_SOFTWARE | 0x00030000)\r
-#define EFI_SOFTWARE_DXE_CORE             (EFI_SOFTWARE | 0x00040000)\r
-#define EFI_SOFTWARE_DXE_BS_DRIVER        (EFI_SOFTWARE | 0x00050000)\r
-#define EFI_SOFTWARE_DXE_RT_DRIVER        (EFI_SOFTWARE | 0x00060000)\r
-#define EFI_SOFTWARE_SMM_DRIVER           (EFI_SOFTWARE | 0x00070000)\r
-#define EFI_SOFTWARE_EFI_APPLICATION      (EFI_SOFTWARE | 0x00080000)\r
-#define EFI_SOFTWARE_EFI_OS_LOADER        (EFI_SOFTWARE | 0x00090000)\r
-#define EFI_SOFTWARE_RT                   (EFI_SOFTWARE | 0x000A0000)\r
-#define EFI_SOFTWARE_AL                   (EFI_SOFTWARE | 0x000B0000)\r
-#define EFI_SOFTWARE_EBC_EXCEPTION        (EFI_SOFTWARE | 0x000C0000)\r
-#define EFI_SOFTWARE_IA32_EXCEPTION       (EFI_SOFTWARE | 0x000D0000)\r
-#define EFI_SOFTWARE_IPF_EXCEPTION        (EFI_SOFTWARE | 0x000E0000)\r
-#define EFI_SOFTWARE_PEI_SERVICE          (EFI_SOFTWARE | 0x000F0000)\r
-#define EFI_SOFTWARE_EFI_BOOT_SERVICE     (EFI_SOFTWARE | 0x00100000)\r
-#define EFI_SOFTWARE_EFI_RUNTIME_SERVICE  (EFI_SOFTWARE | 0x00110000)\r
-#define EFI_SOFTWARE_EFI_DXE_SERVICE      (EFI_SOFTWARE | 0x00120000)\r
-///\r
-/// Inconsistent with specification here: \r
-/// The Framework Spec, StatusCodes0.92, does not define the macro. And the definition\r
-/// is expected to be adopt by PI Spec.\r
-///\r
-#define EFI_SOFTWARE_X64_EXCEPTION        (EFI_SOFTWARE | 0x00130000)\r
-///@}\r
-\r
-///\r
-/// Software Class Progress Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_SW_PC_INIT                0x00000000\r
-#define EFI_SW_PC_LOAD                0x00000001\r
-#define EFI_SW_PC_INIT_BEGIN          0x00000002\r
-#define EFI_SW_PC_INIT_END            0x00000003\r
-#define EFI_SW_PC_AUTHENTICATE_BEGIN  0x00000004\r
-#define EFI_SW_PC_AUTHENTICATE_END    0x00000005\r
-#define EFI_SW_PC_INPUT_WAIT          0x00000006\r
-#define EFI_SW_PC_USER_SETUP          0x00000007\r
-///@}\r
+#ifndef _FRAMEWORK_STATUS_CODE_H_\r
+#define _FRAMEWORK_STATUS_CODE_H_\r

 \r
 //\r
 \r
 //\r

-// Software Class Unspecified Subclass Progress Code definitions.\r
+// Required for X64 defines for CPU exception types\r

 //\r
 //\r

-///\r
-/// Software Class SEC Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_SEC_PC_ENTRY_POINT     (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_SEC_PC_HANDOFF_TO_NEXT (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-///\r
-/// Software Class PEI Core Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_PEI_CORE_PC_ENTRY_POINT      (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_PEI_CORE_PC_HANDOFF_TO_NEXT  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_PEI_CORE_PC_RETURN_TO_LAST   (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-///@}\r
-\r
-///\r
-/// Software Class PEI Module Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_PEIM_PC_RECOVERY_BEGIN (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_PEIM_PC_CAPSULE_LOAD   (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_PEIM_PC_CAPSULE_START  (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_PEIM_PC_RECOVERY_USER  (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_SW_PEIM_PC_RECOVERY_AUTO  (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-///@}\r
-\r
-///\r
-/// Software Class DXE Core Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_DXE_CORE_PC_ENTRY_POINT      (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_DXE_CORE_PC_RETURN_TO_LAST   (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_DXE_CORE_PC_START_DRIVER     (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-///@}\r
+#include <Protocol/DebugSupport.h>\r

 \r
 ///\r
 /// Software Class DXE BS Driver Subclass Progress Code definitions.\r
 \r
 ///\r
 /// Software Class DXE BS Driver Subclass Progress Code definitions.\r

-///@{\r
-#define EFI_SW_DXE_BS_PC_LEGACY_OPROM_INIT            (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT          (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT            (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_DXE_BS_PC_EXIT_BOOT_SERVICES_EVENT     (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_SW_DXE_BS_PC_VIRTUAL_ADDRESS_CHANGE_EVENT (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-///@}\r
-\r

 ///\r
 /// Inconsistent with specification here: \r
 ///\r
 /// Inconsistent with specification here: \r

-/// The Framework Spec, StatusCodes0.92, does not define the macro. And the definition\r
-/// is expected to be adopt by PI Spec.\r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r
+///\r

 ///@{\r
 #define EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS     (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
 #define EFI_SW_DXE_BS_PC_VERIFYING_PASSWORD           (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
 ///@{\r
 #define EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS     (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
 #define EFI_SW_DXE_BS_PC_VERIFYING_PASSWORD           (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r


@@ -625,8 +40,8 @@ typedef UINT32                                  EFI_CPU_STATE_CHANGE_CAUSE;
 /// Software Class DXE RT Driver Subclass Progress Code definitions.\r
 ///\r
 /// Inconsistent with specification here: \r
 /// Software Class DXE RT Driver Subclass Progress Code definitions.\r
 ///\r
 /// Inconsistent with specification here: \r

-/// The Framework Spec, StatusCodes0.92, does not define the macro. And the definition\r
-/// is expected to be adopt by PI Spec.\r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r
+///\r

 ///@{\r
 #define EFI_SW_DXE_RT_PC_S0 (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
 #define EFI_SW_DXE_RT_PC_S1 (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
 ///@{\r
 #define EFI_SW_DXE_RT_PC_S0 (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
 #define EFI_SW_DXE_RT_PC_S1 (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r


@@ -636,262 +51,13 @@ typedef UINT32                                  EFI_CPU_STATE_CHANGE_CAUSE;
 #define EFI_SW_DXE_RT_PC_S5 (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
 ///@}\r
 \r
 #define EFI_SW_DXE_RT_PC_S5 (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
 ///@}\r
 \r

-//\r
-// Software Class SMM Driver Subclass Progress Code definitions.\r
-//\r
-//\r
-// Software Class EFI Application Subclass Progress Code definitions.\r
-//\r
-//\r
-// Software Class EFI OS Loader Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Software Class EFI RT Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_RT_PC_ENTRY_POINT      (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_RT_PC_HANDOFF_TO_NEXT  (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_RT_PC_RETURN_TO_LAST   (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-///@}\r
-\r
-///\r
-/// Software Class EFI AL Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_AL_PC_ENTRY_POINT    (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_AL_PC_RETURN_TO_LAST (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-//\r
-// Software Class EBC Exception Subclass Progress Code definitions.\r
-//\r
-//\r
-// Software Class IA32 Exception Subclass Progress Code definitions.\r
-//\r
-//\r
-// Software Class X64 Exception Subclass Progress Code definitions.\r
-//\r
-//\r
-// Software Class IPF Exception Subclass Progress Code definitions.\r
-//\r
-///\r
-/// Software Class PEI Services Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_PS_PC_INSTALL_PPI            (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_PS_PC_REINSTALL_PPI          (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_PS_PC_LOCATE_PPI             (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_PS_PC_NOTIFY_PPI             (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_SW_PS_PC_GET_BOOT_MODE          (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_SW_PS_PC_SET_BOOT_MODE          (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_SW_PS_PC_GET_HOB_LIST           (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-#define EFI_SW_PS_PC_CREATE_HOB             (EFI_SUBCLASS_SPECIFIC | 0x00000007)\r
-#define EFI_SW_PS_PC_FFS_FIND_NEXT_VOLUME   (EFI_SUBCLASS_SPECIFIC | 0x00000008)\r
-#define EFI_SW_PS_PC_FFS_FIND_NEXT_FILE     (EFI_SUBCLASS_SPECIFIC | 0x00000009)\r
-#define EFI_SW_PS_PC_FFS_FIND_SECTION_DATA  (EFI_SUBCLASS_SPECIFIC | 0x0000000A)\r
-#define EFI_SW_PS_PC_INSTALL_PEI_MEMORY     (EFI_SUBCLASS_SPECIFIC | 0x0000000B)\r
-#define EFI_SW_PS_PC_ALLOCATE_PAGES         (EFI_SUBCLASS_SPECIFIC | 0x0000000C)\r
-#define EFI_SW_PS_PC_ALLOCATE_POOL          (EFI_SUBCLASS_SPECIFIC | 0x0000000D)\r
-#define EFI_SW_PS_PC_COPY_MEM               (EFI_SUBCLASS_SPECIFIC | 0x0000000E)\r
-#define EFI_SW_PS_PC_SET_MEM                (EFI_SUBCLASS_SPECIFIC | 0x0000000F)\r
-///@}\r
-\r
-///\r
-/// Software Class EFI Boot Services Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_BS_PC_RAISE_TPL                      (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_BS_PC_RESTORE_TPL                    (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_BS_PC_ALLOCATE_PAGES                 (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_BS_PC_FREE_PAGES                     (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_SW_BS_PC_GET_MEMORY_MAP                 (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_SW_BS_PC_ALLOCATE_POOL                  (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_SW_BS_PC_FREE_POOL                      (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-#define EFI_SW_BS_PC_CREATE_EVENT                   (EFI_SUBCLASS_SPECIFIC | 0x00000007)\r
-#define EFI_SW_BS_PC_SET_TIMER                      (EFI_SUBCLASS_SPECIFIC | 0x00000008)\r
-#define EFI_SW_BS_PC_WAIT_FOR_EVENT                 (EFI_SUBCLASS_SPECIFIC | 0x00000009)\r
-#define EFI_SW_BS_PC_SIGNAL_EVENT                   (EFI_SUBCLASS_SPECIFIC | 0x0000000A)\r
-#define EFI_SW_BS_PC_CLOSE_EVENT                    (EFI_SUBCLASS_SPECIFIC | 0x0000000B)\r
-#define EFI_SW_BS_PC_CHECK_EVENT                    (EFI_SUBCLASS_SPECIFIC | 0x0000000C)\r
-#define EFI_SW_BS_PC_INSTALL_PROTOCOL_INTERFACE     (EFI_SUBCLASS_SPECIFIC | 0x0000000D)\r
-#define EFI_SW_BS_PC_REINSTALL_PROTOCOL_INTERFACE   (EFI_SUBCLASS_SPECIFIC | 0x0000000E)\r
-#define EFI_SW_BS_PC_UNINSTALL_PROTOCOL_INTERFACE   (EFI_SUBCLASS_SPECIFIC | 0x0000000F)\r
-#define EFI_SW_BS_PC_HANDLE_PROTOCOL                (EFI_SUBCLASS_SPECIFIC | 0x00000010)\r
-#define EFI_SW_BS_PC_PC_HANDLE_PROTOCOL             (EFI_SUBCLASS_SPECIFIC | 0x00000011)\r
-#define EFI_SW_BS_PC_REGISTER_PROTOCOL_NOTIFY       (EFI_SUBCLASS_SPECIFIC | 0x00000012)\r
-#define EFI_SW_BS_PC_LOCATE_HANDLE                  (EFI_SUBCLASS_SPECIFIC | 0x00000013)\r
-#define EFI_SW_BS_PC_INSTALL_CONFIGURATION_TABLE    (EFI_SUBCLASS_SPECIFIC | 0x00000014)\r
-#define EFI_SW_BS_PC_LOAD_IMAGE                     (EFI_SUBCLASS_SPECIFIC | 0x00000015)\r
-#define EFI_SW_BS_PC_START_IMAGE                    (EFI_SUBCLASS_SPECIFIC | 0x00000016)\r
-#define EFI_SW_BS_PC_EXIT                           (EFI_SUBCLASS_SPECIFIC | 0x00000017)\r
-#define EFI_SW_BS_PC_UNLOAD_IMAGE                   (EFI_SUBCLASS_SPECIFIC | 0x00000018)\r
-#define EFI_SW_BS_PC_EXIT_BOOT_SERVICES             (EFI_SUBCLASS_SPECIFIC | 0x00000019)\r
-#define EFI_SW_BS_PC_GET_NEXT_MONOTONIC_COUNT       (EFI_SUBCLASS_SPECIFIC | 0x0000001A)\r
-#define EFI_SW_BS_PC_STALL                          (EFI_SUBCLASS_SPECIFIC | 0x0000001B)\r
-#define EFI_SW_BS_PC_SET_WATCHDOG_TIMER             (EFI_SUBCLASS_SPECIFIC | 0x0000001C)\r
-#define EFI_SW_BS_PC_CONNECT_CONTROLLER             (EFI_SUBCLASS_SPECIFIC | 0x0000001D)\r
-#define EFI_SW_BS_PC_DISCONNECT_CONTROLLER          (EFI_SUBCLASS_SPECIFIC | 0x0000001E)\r
-#define EFI_SW_BS_PC_OPEN_PROTOCOL                  (EFI_SUBCLASS_SPECIFIC | 0x0000001F)\r
-#define EFI_SW_BS_PC_CLOSE_PROTOCOL                 (EFI_SUBCLASS_SPECIFIC | 0x00000020)\r
-#define EFI_SW_BS_PC_OPEN_PROTOCOL_INFORMATION      (EFI_SUBCLASS_SPECIFIC | 0x00000021)\r
-#define EFI_SW_BS_PC_PROTOCOLS_PER_HANDLE           (EFI_SUBCLASS_SPECIFIC | 0x00000022)\r
-#define EFI_SW_BS_PC_LOCATE_HANDLE_BUFFER           (EFI_SUBCLASS_SPECIFIC | 0x00000023)\r
-#define EFI_SW_BS_PC_LOCATE_PROTOCOL                (EFI_SUBCLASS_SPECIFIC | 0x00000024)\r
-#define EFI_SW_BS_PC_INSTALL_MULTIPLE_INTERFACES    (EFI_SUBCLASS_SPECIFIC | 0x00000025)\r
-#define EFI_SW_BS_PC_UNINSTALL_MULTIPLE_INTERFACES  (EFI_SUBCLASS_SPECIFIC | 0x00000026)\r
-#define EFI_SW_BS_PC_CALCULATE_CRC_32               (EFI_SUBCLASS_SPECIFIC | 0x00000027)\r
-#define EFI_SW_BS_PC_COPY_MEM                       (EFI_SUBCLASS_SPECIFIC | 0x00000028)\r
-#define EFI_SW_BS_PC_SET_MEM                        (EFI_SUBCLASS_SPECIFIC | 0x00000029)\r
-///@}\r
-\r

 ///\r
 ///\r

-/// Software Class EFI Runtime Services Subclass Progress Code definitions.\r
-///@{\r
-#define EFI_SW_RS_PC_GET_TIME                       (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_RS_PC_SET_TIME                       (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_RS_PC_GET_WAKEUP_TIME                (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_RS_PC_SET_WAKEUP_TIME                (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP        (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_SW_RS_PC_CONVERT_POINTER                (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_SW_RS_PC_GET_VARIABLE                   (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-#define EFI_SW_RS_PC_GET_NEXT_VARIABLE_NAME         (EFI_SUBCLASS_SPECIFIC | 0x00000007)\r
-#define EFI_SW_RS_PC_SET_VARIABLE                   (EFI_SUBCLASS_SPECIFIC | 0x00000008)\r
-#define EFI_SW_RS_PC_GET_NEXT_HIGH_MONOTONIC_COUNT  (EFI_SUBCLASS_SPECIFIC | 0x00000009)\r
-#define EFI_SW_RS_PC_RESET_SYSTEM                   (EFI_SUBCLASS_SPECIFIC | 0x0000000A)\r
-///@{\r
-\r
-///\r
-/// Software Class EFI DXE Services Subclass Progress Code definitions\r
-///@{\r
-#define EFI_SW_DS_PC_ADD_MEMORY_SPACE             (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_DS_PC_ALLOCATE_MEMORY_SPACE        (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-#define EFI_SW_DS_PC_FREE_MEMORY_SPACE            (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
-#define EFI_SW_DS_PC_REMOVE_MEMORY_SPACE          (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
-#define EFI_SW_DS_PC_GET_MEMORY_SPACE_DESCRIPTOR  (EFI_SUBCLASS_SPECIFIC | 0x00000004)\r
-#define EFI_SW_DS_PC_SET_MEMORY_SPACE_ATTRIBUTES  (EFI_SUBCLASS_SPECIFIC | 0x00000005)\r
-#define EFI_SW_DS_PC_GET_MEMORY_SPACE_MAP         (EFI_SUBCLASS_SPECIFIC | 0x00000006)\r
-#define EFI_SW_DS_PC_ADD_IO_SPACE                 (EFI_SUBCLASS_SPECIFIC | 0x00000007)\r
-#define EFI_SW_DS_PC_ALLOCATE_IO_SPACE            (EFI_SUBCLASS_SPECIFIC | 0x00000008)\r
-#define EFI_SW_DS_PC_FREE_IO_SPACE                (EFI_SUBCLASS_SPECIFIC | 0x00000009)\r
-#define EFI_SW_DS_PC_REMOVE_IO_SPACE              (EFI_SUBCLASS_SPECIFIC | 0x0000000A)\r
-#define EFI_SW_DS_PC_GET_IO_SPACE_DESCRIPTOR      (EFI_SUBCLASS_SPECIFIC | 0x0000000B)\r
-#define EFI_SW_DS_PC_GET_IO_SPACE_MAP             (EFI_SUBCLASS_SPECIFIC | 0x0000000C)\r
-#define EFI_SW_DS_PC_DISPATCH                     (EFI_SUBCLASS_SPECIFIC | 0x0000000D)\r
-#define EFI_SW_DS_PC_SCHEDULE                     (EFI_SUBCLASS_SPECIFIC | 0x0000000E)\r
-#define EFI_SW_DS_PC_TRUST                        (EFI_SUBCLASS_SPECIFIC | 0x0000000F)\r
-#define EFI_SW_DS_PC_PROCESS_FIRMWARE_VOLUME      (EFI_SUBCLASS_SPECIFIC | 0x00000010)\r
-///@}\r
-\r
-///\r
-/// Software Class Error Code definitions.\r
-/// These are shared by all subclasses.\r
-///@{\r
-#define EFI_SW_EC_NON_SPECIFIC            0x00000000\r
-#define EFI_SW_EC_LOAD_ERROR              0x00000001\r
-#define EFI_SW_EC_INVALID_PARAMETER       0x00000002\r
-#define EFI_SW_EC_UNSUPPORTED             0x00000003\r
-#define EFI_SW_EC_INVALID_BUFFER          0x00000004\r
-#define EFI_SW_EC_OUT_OF_RESOURCES        0x00000005\r
-#define EFI_SW_EC_ABORTED                 0x00000006\r
-#define EFI_SW_EC_ILLEGAL_SOFTWARE_STATE  0x00000007\r
-#define EFI_SW_EC_ILLEGAL_HARDWARE_STATE  0x00000008\r
-#define EFI_SW_EC_START_ERROR             0x00000009\r
-#define EFI_SW_EC_BAD_DATE_TIME           0x0000000A\r
-#define EFI_SW_EC_CFG_INVALID             0x0000000B\r
-#define EFI_SW_EC_CFG_CLR_REQUEST         0x0000000C\r
-#define EFI_SW_EC_CFG_DEFAULT             0x0000000D\r
-#define EFI_SW_EC_PWD_INVALID             0x0000000E\r
-#define EFI_SW_EC_PWD_CLR_REQUEST         0x0000000F\r
-#define EFI_SW_EC_PWD_CLEARED             0x00000010\r
-#define EFI_SW_EC_EVENT_LOG_FULL          0x00000011\r
-///@}\r
-\r
-//\r
-// Software Class Unspecified Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class SEC Subclass Error Code definitions.\r
-//\r
-///\r
-/// Software Class PEI Core Subclass Error Code definitions.\r
-///\r
-#define EFI_SW_PEI_CORE_EC_DXE_CORRUPT  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-\r
-///\r
-/// Software Class PEI Module Subclass Error Code definitions.\r
-///@{\r
-#define EFI_SW_PEIM_EC_NO_RECOVERY_CAPSULE        (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-#define EFI_SW_PEIM_EC_INVALID_CAPSULE_DESCRIPTOR (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
-///@}\r
-\r
-///\r
-/// Software Class DXE Core Subclass Error Code definitions.\r
+/// Software Subclass definitions.\r

 ///\r
 /// Inconsistent with specification here: \r
 ///\r
 /// Inconsistent with specification here: \r

-/// The Framework Spec, StatusCodes0.92, does not define the macro. And the definition\r
-/// is expected to be adopt by PI Spec.\r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r

 ///\r
 ///\r

-#define EFI_SW_CSM_LEGACY_ROM_INIT  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-///\r
-/// Software Class DXE Boot Service Driver Subclass Error Code definitions.\r
-///\r
-#define EFI_SW_DXE_BS_EC_LEGACY_OPROM_NO_SPACE  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
-\r
-//\r
-// Software Class DXE Runtime Service Driver Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class SMM Driver Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class EFI Application Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class EFI OS Loader Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class EFI RT Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class EFI AL Subclass Error Code definitions.\r
-//\r
-///\r
-/// Software Class EBC Exception Subclass Error Code definitions.\r
-/// These exceptions are derived from the debug protocol definitions in the EFI\r
-/// specification.\r
-///@{\r
-#define EFI_SW_EC_EBC_UNDEFINED             0x00000000\r
-#define EFI_SW_EC_EBC_DIVIDE_ERROR          EXCEPT_EBC_DIVIDE_ERROR\r
-#define EFI_SW_EC_EBC_DEBUG                 EXCEPT_EBC_DEBUG\r
-#define EFI_SW_EC_EBC_BREAKPOINT            EXCEPT_EBC_BREAKPOINT\r
-#define EFI_SW_EC_EBC_OVERFLOW              EXCEPT_EBC_OVERFLOW\r
-#define EFI_SW_EC_EBC_INVALID_OPCODE        EXCEPT_EBC_INVALID_OPCODE\r
-#define EFI_SW_EC_EBC_STACK_FAULT           EXCEPT_EBC_STACK_FAULT\r
-#define EFI_SW_EC_EBC_ALIGNMENT_CHECK       EXCEPT_EBC_ALIGNMENT_CHECK\r
-#define EFI_SW_EC_EBC_INSTRUCTION_ENCODING  EXCEPT_EBC_INSTRUCTION_ENCODING\r
-#define EFI_SW_EC_EBC_BAD_BREAK             EXCEPT_EBC_BAD_BREAK\r
-#define EFI_SW_EC_EBC_STEP                  EXCEPT_EBC_STEP\r
-///@}\r
-\r
-///\r
-/// Software Class IA32 Exception Subclass Error Code definitions.\r
-/// These exceptions are derived from the debug protocol definitions in the EFI\r
-/// specification.\r
-///@{\r
-#define EFI_SW_EC_IA32_DIVIDE_ERROR     EXCEPT_IA32_DIVIDE_ERROR\r
-#define EFI_SW_EC_IA32_DEBUG            EXCEPT_IA32_DEBUG\r
-#define EFI_SW_EC_IA32_NMI              EXCEPT_IA32_NMI\r
-#define EFI_SW_EC_IA32_BREAKPOINT       EXCEPT_IA32_BREAKPOINT\r
-#define EFI_SW_EC_IA32_OVERFLOW         EXCEPT_IA32_OVERFLOW\r
-#define EFI_SW_EC_IA32_BOUND            EXCEPT_IA32_BOUND\r
-#define EFI_SW_EC_IA32_INVALID_OPCODE   EXCEPT_IA32_INVALID_OPCODE\r
-#define EFI_SW_EC_IA32_DOUBLE_FAULT     EXCEPT_IA32_DOUBLE_FAULT\r
-#define EFI_SW_EC_IA32_INVALID_TSS      EXCEPT_IA32_INVALID_TSS\r
-#define EFI_SW_EC_IA32_SEG_NOT_PRESENT  EXCEPT_IA32_SEG_NOT_PRESENT\r
-#define EFI_SW_EC_IA32_STACK_FAULT      EXCEPT_IA32_STACK_FAULT\r
-#define EFI_SW_EC_IA32_GP_FAULT         EXCEPT_IA32_GP_FAULT\r
-#define EFI_SW_EC_IA32_PAGE_FAULT       EXCEPT_IA32_PAGE_FAULT\r
-#define EFI_SW_EC_IA32_FP_ERROR         EXCEPT_IA32_FP_ERROR\r
-#define EFI_SW_EC_IA32_ALIGNMENT_CHECK  EXCEPT_IA32_ALIGNMENT_CHECK\r
-#define EFI_SW_EC_IA32_MACHINE_CHECK    EXCEPT_IA32_MACHINE_CHECK\r
-#define EFI_SW_EC_IA32_SIMD             EXCEPT_IA32_SIMD\r
-///@}\r
+#define EFI_SOFTWARE_X64_EXCEPTION        (EFI_SOFTWARE | 0x00130000)\r

 \r
 ///\r
 /// Software Class X64 Exception Subclass Error Code definitions.\r
 \r
 ///\r
 /// Software Class X64 Exception Subclass Error Code definitions.\r


@@ -899,8 +65,8 @@ typedef UINT32                                  EFI_CPU_STATE_CHANGE_CAUSE;
 /// specification.\r
 ///\r
 /// Inconsistent with specification here: \r
 /// specification.\r
 ///\r
 /// Inconsistent with specification here: \r

-/// The Framework Spec, StatusCodes0.92, does not define the macro. And the definition\r
-/// is expected to be adopt by PI Spec.\r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r
+///\r

 ///@{\r
 #define EFI_SW_EC_X64_DIVIDE_ERROR      EXCEPT_X64_DIVIDE_ERROR\r
 #define EFI_SW_EC_X64_DEBUG             EXCEPT_X64_DEBUG\r
 ///@{\r
 #define EFI_SW_EC_X64_DIVIDE_ERROR      EXCEPT_X64_DIVIDE_ERROR\r
 #define EFI_SW_EC_X64_DEBUG             EXCEPT_X64_DEBUG\r


@@ -922,43 +88,55 @@ typedef UINT32                                  EFI_CPU_STATE_CHANGE_CAUSE;
 ///@}\r
 \r
 ///\r
 ///@}\r
 \r
 ///\r

-/// Software Class IPF Exception Subclass Error Code definitions.\r
-/// These exceptions are derived from the debug protocol definitions in the EFI\r
-/// specification.\r
+/// Software Class EFI After Life Subclass Progress Code definitions.\r
+///\r

 ///@{\r
 ///@{\r

-#define EFI_SW_EC_IPF_ALT_DTLB            EXCEPT_IPF_ALT_DTLB\r
-#define EFI_SW_EC_IPF_DNESTED_TLB         EXCEPT_IPF_DNESTED_TLB\r
-#define EFI_SW_EC_IPF_BREAKPOINT          EXCEPT_IPF_BREAKPOINT\r
-#define EFI_SW_EC_IPF_EXTERNAL_INTERRUPT  EXCEPT_IPF_EXTERNAL_INTERRUPT\r
-#define EFI_SW_EC_IPF_GEN_EXCEPT          EXCEPT_IPF_GEN_EXCEPT\r
-#define EFI_SW_EC_IPF_NAT_CONSUMPTION     EXCEPT_IPF_NAT_CONSUMPTION\r
-#define EFI_SW_EC_IPF_DEBUG_EXCEPT        EXCEPT_IPF_DEBUG_EXCEPT\r
-#define EFI_SW_EC_IPF_UNALIGNED_ACCESS    EXCEPT_IPF_UNALIGNED_ACCESS\r
-#define EFI_SW_EC_IPF_FP_FAULT            EXCEPT_IPF_FP_FAULT\r
-#define EFI_SW_EC_IPF_FP_TRAP             EXCEPT_IPF_FP_TRAP\r
-#define EFI_SW_EC_IPF_TAKEN_BRANCH        EXCEPT_IPF_TAKEN_BRANCH\r
-#define EFI_SW_EC_IPF_SINGLE_STEP         EXCEPT_IPF_SINGLE_STEP\r
+#define EFI_SW_AL_PC_ENTRY_POINT    (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
+#define EFI_SW_AL_PC_RETURN_TO_LAST (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r

 ///@}\r
 \r
 ///@}\r
 \r

-//\r
-// Software Class PEI Service Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class EFI Boot Service Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class EFI Runtime Service Subclass Error Code definitions.\r
-//\r
-//\r
-// Software Class EFI DXE Service Subclass Error Code definitions.\r
-//\r
+///\r
+/// Software Class DXE Core Subclass Error Code definitions.\r
+///\r
+/// Inconsistent with specification here: \r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r
+///\r
+#define EFI_SW_CSM_LEGACY_ROM_INIT                (EFI_SUBCLASS_SPECIFIC | 0x00000000)   \r

 \r
 ///\r
 \r
 ///\r

-/// Section 6\r
-/// Debug Code definitions for all classes and subclass\r
-/// Only one debug code is defined at this point and should\r
-/// be used for anything that gets sent to debug stream.\r
+/// IO Bus Class ATA/ATAPI Subclass Progress Code definitions.\r
+///\r

 ///\r
 ///\r

-#define EFI_DC_UNSPECIFIED  0x0\r
+/// Inconsistent with specification here: \r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r
+///\r
+///@{\r
+#define EFI_IOB_ATA_BUS_SMART_ENABLE          (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
+#define EFI_IOB_ATA_BUS_SMART_DISABLE         (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
+#define EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD   (EFI_SUBCLASS_SPECIFIC | 0x00000002)\r
+#define EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD  (EFI_SUBCLASS_SPECIFIC | 0x00000003)\r
+///@}\r
+\r
+///\r
+/// IO Bus Class ATA/ATAPI Subclass Error Code definitions.\r
+///\r
+///\r
+/// Inconsistent with specification here: \r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r
+///\r
+///@{\r
+#define EFI_IOB_ATA_BUS_SMART_NOTSUPPORTED  (EFI_SUBCLASS_SPECIFIC | 0x00000000)\r
+#define EFI_IOB_ATA_BUS_SMART_DISABLED      (EFI_SUBCLASS_SPECIFIC | 0x00000001)\r
+///@}\r
+\r
+///\r
+/// The reason that the processor was disabled.\r
+///\r
+/// Inconsistent with specification here: \r
+/// The Framework Specification, StatusCodes 0.92, does not define the macros. \r
+///\r
+///@{\r
+#define EFI_CPU_CAUSE_NOT_DISABLED              0x0000\r
+///@}\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
index 10d33ec9204863272fb593babedcc9f6153e1fac..a7cc2f7682008cf660af067ee188a41e4753821b 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
+++ b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h
@@ -18,6 +18,11 @@
 #ifndef _DATAHUB_RECORDS_GUID_H_\r
 #define _DATAHUB_RECORDS_GUID_H_\r
 \r
 #ifndef _DATAHUB_RECORDS_GUID_H_\r
 #define _DATAHUB_RECORDS_GUID_H_\r
 \r

+//\r
+// The include is required to retrieve type EFI_EXP_BASE10_DATA\r
+//\r
+#include <Guid/StatusCodeDataTypeId.h>\r
+\r

 #define EFI_PROCESSOR_SUBCLASS_GUID \\r
   { 0x26fdeb7e, 0xb8af, 0x4ccf, {0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7 } }\r
 \r
 #define EFI_PROCESSOR_SUBCLASS_GUID \\r
   { 0x26fdeb7e, 0xb8af, 0x4ccf, {0xaa, 0x97, 0x02, 0x63, 0x3c, 0xe4, 0x8c, 0xa7 } }\r
 \r


@@ -251,21 +256,6 @@ typedef struct {
   UINT16                            Exponent;\r
 } EFI_EXP_BASE2_DATA;\r
 \r
   UINT16                            Exponent;\r
 } EFI_EXP_BASE2_DATA;\r
 \r

-///\r
-/// This macro provides a calculation for base-2 representations. Value and Exponent are each \r
-/// INT16. It is 16 bits wide and is unsigned to mean nonnegative values.  \r
-///\r
-typedef struct {\r
-  ///\r
-  /// The INT16 number by which to multiply the base-2 representation.\r
-  ///\r
-  INT16                            Value;\r
-  ///\r
-  /// The INT16 number by which to raise the base-2 calculation. \r
-  ///\r
-  INT16                            Exponent;\r
-} EFI_EXP_BASE10_DATA;\r
-\r

 typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_MAX_CORE_FREQUENCY_DATA;\r
 typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_MAX_FSB_FREQUENCY_DATA;\r
 typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_CORE_FREQUENCY_DATA;\r
 typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_MAX_CORE_FREQUENCY_DATA;\r
 typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_MAX_FSB_FREQUENCY_DATA;\r
 typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_CORE_FREQUENCY_DATA;\r

diff --git a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
deleted file mode 100644 (file)
index 8e69954..0000000
--- a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
+++ /dev/null
@@ -1,504 +0,0 @@
-/** @file\r
-  GUID used to identify id for the caller who is initiating the Status Code.\r
-\r
-  Copyright (c) 2006, 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-  @par Revision Reference:\r
-  GUIDs defined in Status Codes Specification 0.92\r
-\r
-**/\r
-\r
-#ifndef __STATUS_CODE_DATA_TYPE_ID_GUID_H__\r
-#define __STATUS_CODE_DATA_TYPE_ID_GUID_H__\r
-\r
-#include <FrameworkDxe.h>\r
-#include <Protocol/DebugSupport.h>\r
-#include <Protocol/FrameworkHii.h>\r
-#include <Guid/DataHubRecords.h>\r
-\r
-//////////////////////////////////////////////////////////////////////////////////////////\r
-// String Data Type defintion. This is part of Status Code Specification\r
-//////////////////////////////////////////////////////////////////////////////////////////\r
-#define EFI_STATUS_CODE_DATA_TYPE_STRING_GUID \\r
-  { 0x92D11080, 0x496F, 0x4D95, { 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A } }\r
-\r
-#pragma pack(1)\r
-\r
-typedef enum {\r
-  EfiStringAscii,    ///< A NULL-terminated ASCII string.\r
-  EfiStringUnicode,  ///< A double NULL-terminated Unicode string.\r
-  EfiStringToken     ///< An EFI_STATUS_CODE_STRING_TOKEN representing the string. \r
-                     ///< The actual string can be obtained by querying the HII Database.\r
-} EFI_STRING_TYPE;\r
-\r
-typedef struct {\r
-  FRAMEWORK_EFI_HII_HANDLE  Handle;  ///< The HII handle of the string pack, which can be\r
-                                     ///< used to retrieve the string. It is a dynamic value\r
-                                     ///< that may not be the same for different boots.\r
-  STRING_REF      Token;             ///< When combined with the HII handle, the string \r
-                                     ///< token can be used to retrieve the string.\r
-\r
-} EFI_STATUS_CODE_STRING_TOKEN;\r
-\r
-typedef union {\r
-  CHAR8                         *Ascii;   ///< ASCII formatted string.\r
-  CHAR16                        *Unicode; ///< Unicode formatted string.\r
-  EFI_STATUS_CODE_STRING_TOKEN  Hii;      ///< HII handle/token pair.\r
-} EFI_STATUS_CODE_STRING;\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA           DataHeader; ///< The data header identifying the data.\r
-  EFI_STRING_TYPE                StringType; ///< Specifies if the string is ASCII or Unicode.\r
-  EFI_STATUS_CODE_STRING         String;     ///< A pointer to a null-terminated ASCII or Unicode string.\r
-} EFI_STATUS_CODE_STRING_DATA;\r
-#pragma pack()\r
-\r
-extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;\r
-\r
-\r
-//////////////////////////////////////////////////////////////////////////////////////////\r
-// Special Data Type defintion. This is part of Status Code Specification\r
-//////////////////////////////////////////////////////////////////////////////////////////\r
-#define EFI_STATUS_CODE_SPECIFIC_DATA_GUID \\r
-  { 0x335984bd, 0xe805, 0x409a, { 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6 } }\r
-\r
-#pragma pack(1)\r
-\r
-///\r
-/// Device handle Extended Data. Used for many\r
-/// errors and progress codes to point to the device.\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_HANDLE            Handle;\r
-} EFI_DEVICE_HANDLE_EXTENDED_DATA;\r
-\r
-///\r
-/// Extended data about the device path, which is used for many errors and \r
-/// progress codes to point to the device.\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA                 DataHeader;\r
-  UINT8                                *DevicePath;\r
-} EFI_DEVICE_PATH_EXTENDED_DATA;\r
-\r
-///\r
-/// This structure defines extended data describing a PCI resource allocation error.\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA               DataHeader;\r
-  UINT32                             Bar;\r
-  UINT16                             DevicePathSize;\r
-  UINT16                             ReqResSize;\r
-  UINT16                             AllocResSize;\r
-  UINT8                              *DevicePath;\r
-  UINT8                              *ReqRes;\r
-  UINT8                              *AllocRes;\r
-} EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA;\r
-\r
-///\r
-/// This structure provides the voltage at the time of error. It also provides \r
-/// the threshold value indicating the minimum or maximum voltage that is considered \r
-/// an error. If the voltage is less then the threshold, the error indicates that the \r
-/// voltage fell below the minimum acceptable value. If the voltage is greater then the threshold, \r
-/// the error indicates that the voltage rose above the maximum acceptable value.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data.  \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The voltage value at the time of the error.\r
-  ///\r
-  EFI_EXP_BASE10_DATA   Voltage;\r
-  ///\r
-  /// The voltage threshold.\r
-  ///\r
-  EFI_EXP_BASE10_DATA   Threshold;\r
-} EFI_COMPUTING_UNIT_VOLTAGE_ERROR_DATA;\r
-\r
-///\r
-/// Microcode Update Extended Error Data\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The version of the microcode update from the header.\r
-  ///\r
-  UINT32                Version;\r
-} EFI_COMPUTING_UNIT_MICROCODE_UPDATE_ERROR_DATA;\r
-\r
-///\r
-/// Asynchronous Timer Extended Error Data\r
-/// The timer limit provides the timeout value of the timer prior to expiration.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The number of seconds that the computing unit timer was configured to expire.\r
-  ///\r
-  EFI_EXP_BASE10_DATA   TimerLimit;\r
-} EFI_COMPUTING_UNIT_TIMER_EXPIRED_ERROR_DATA;\r
-\r
-///\r
-/// Host Processor Mismatch Extended Error Data\r
-/// This provides information to indicate which processors mismatch, and how they mismatch. The \r
-/// status code contains the instance number of the processor that is in error. This structure's \r
-/// Instance indicates the second processor that does not match. This differentiation allows the \r
-/// consumer to determine which two processors do not match. The Attributes indicate what \r
-/// mismatch is being reported. Because Attributes is a bit field, more than one mismatch can be \r
-/// reported with one error code.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The unit number of the computing unit that does not match.\r
-  ///  \r
-  UINT32                Instance;\r
-  /// \r
-  /// The attributes describing the failure. \r
-  ///  \r
-  UINT16                Attributes;\r
-} EFI_HOST_PROCESSOR_MISMATCH_ERROR_DATA;\r
-\r
-///\r
-/// Thermal Extended Error Data\r
-/// This structure provides the temperature at the time of error. It also provides the threshold value \r
-/// indicating the minimum temperature that is considered an error.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The thermal value at the time of the error.\r
-  ///\r
-  EFI_EXP_BASE10_DATA   Temperature;\r
-  ///\r
-  /// The thermal threshold.\r
-  ///\r
-  EFI_EXP_BASE10_DATA   Threshold;\r
-} EFI_COMPUTING_UNIT_THERMAL_ERROR_DATA;\r
-\r
-//\r
-// Valid cache types\r
-//\r
-typedef enum {\r
-  EfiInitCacheDataOnly,\r
-  EfiInitCacheInstrOnly,\r
-  EfiInitCacheBoth,\r
-  EfiInitCacheUnspecified\r
-} EFI_INIT_CACHE_TYPE;\r
-\r
-///\r
-/// Embedded cache init extended data\r
-///\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  UINT32                Level;\r
-  EFI_INIT_CACHE_TYPE   Type;\r
-} EFI_CACHE_INIT_DATA;\r
-\r
-///\r
-/// Processor Disabled Extended Error Data\r
-/// This structure provides details as to why and how the computing unit was disabled. The causes \r
-/// should cover the typical reasons a processor would be disabled. How the processor was disabled is \r
-/// important because there are distinct differences between hardware and software disabling.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The reason for disabling the processor. \r
-  /// \r
-  UINT32                Cause;\r
-  ///\r
-  /// TRUE if the processor is disabled via software means such as not listing it in the ACPI tables. \r
-  /// Such a processor will respond to Interprocessor Interrupts (IPIs). FALSE if the processor is hardware \r
-  /// disabled, which means it is invisible to software and will not respond to IPIs.\r
-  ///\r
-  BOOLEAN               SoftwareDisabled;\r
-} EFI_COMPUTING_UNIT_CPU_DISABLED_ERROR_DATA;\r
-\r
-///\r
-/// Memory Error Operation Definition\r
-///\r
-typedef UINT8 EFI_MEMORY_ERROR_OPERATION;\r
-\r
-///\r
-/// Memory Error Granularity Definition\r
-///\r
-typedef UINT8 EFI_MEMORY_ERROR_GRANULARITY;\r
-\r
-///\r
-/// This structure provides specific details about the memory error that was detected. It provides \r
-/// enough information so that consumers can identify the exact failure and provides enough \r
-/// information to enable corrective action if necessary.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA          DataHeader;\r
-  ///\r
-  /// The error granularity type.\r
-  ///\r
-  EFI_MEMORY_ERROR_GRANULARITY  Granularity;\r
-  ///\r
-  /// The operation that resulted in the error being detected. \r
-  ///\r
-  EFI_MEMORY_ERROR_OPERATION    Operation;\r
-  ///\r
-  /// The error syndrome, vendor-specific ECC syndrome, or CRC data associated with \r
-  /// the error.  If unknown, should be initialized to 0.\r
-  /// Inconsistent with specification here:  \r
-  /// This field in StatusCodes spec0.9 is defined as UINT32, keep code unchanged.\r
-  ///\r
-  UINTN                         Syndrome;\r
-  ///\r
-  /// The physical address of the error. \r
-  ///\r
-  EFI_PHYSICAL_ADDRESS          Address;\r
-  ///\r
-  /// The range, in bytes, within which the error address can be determined.\r
-  ///\r
-  UINTN                         Resolution;\r
-} EFI_MEMORY_EXTENDED_ERROR_DATA;\r
-\r
-///\r
-/// This extended data provides some context that consumers can use to locate a DIMM within the \r
-/// overall memory scheme.  \r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The memory array number.\r
-  ///\r
-  UINT16                Array;\r
-  ///\r
-  /// The device number within that Array.\r
-  ///\r
-  UINT16                Device;\r
-} EFI_STATUS_CODE_DIMM_NUMBER;\r
-\r
-///\r
-/// Memory Module Mismatch Extended Error Data\r
-/// \r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data.\r
-  ///\r
-  EFI_STATUS_CODE_DATA        DataHeader;\r
-  ///\r
-  /// The instance number of the memory module that does not match. \r
-  ///\r
-  EFI_STATUS_CODE_DIMM_NUMBER Instance;\r
-} EFI_MEMORY_MODULE_MISMATCH_ERROR_DATA;\r
-\r
-///\r
-/// Memory Range Extended Data\r
-/// This extended data may be used to convey the specifics of a memory range.  Ranges are specified \r
-/// with a start address and a length.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data. \r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The starting address of the memory range. \r
-  ///\r
-  EFI_PHYSICAL_ADDRESS  Start;\r
-  ///\r
-  /// The length in bytes of the memory range.\r
-  ///\r
-  EFI_PHYSICAL_ADDRESS  Length;\r
-} EFI_MEMORY_RANGE_EXTENDED_DATA;\r
-\r
-///\r
-/// Extended Error Data for Assert\r
-/// The data indicates the location of the assertion that failed in the source code.  This information \r
-/// includes the file name and line number that are necessary to find the failing assertion in source code.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data.\r
-  /// \r
-  EFI_STATUS_CODE_DATA        DataHeader;\r
-  ///\r
-  /// The line number of the source file where the fault was generated.\r
-  ///\r
-  UINT32                      LineNumber;\r
-  ///\r
-  /// The size in bytes of FileName.\r
-  ///\r
-  UINT32                      FileNameSize;\r
-  ///\r
-  /// A pointer to a NULL-terminated ASCII or Unicode string that represents the file \r
-  /// name of the source file where the fault was generated. \r
-  ///\r
-  EFI_STATUS_CODE_STRING_DATA *FileName;\r
-} EFI_DEBUG_ASSERT_DATA;\r
-\r
-///\r
-/// System Context Data EBC/IA32/IPF\r
-///\r
-typedef union {\r
-  EFI_SYSTEM_CONTEXT_EBC  SystemContextEbc;\r
-  EFI_SYSTEM_CONTEXT_IA32 SystemContextIa32;\r
-  EFI_SYSTEM_CONTEXT_IPF  SystemContextIpf;\r
-} EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT;\r
-\r
-///\r
-/// This extended data allows the processor context that is present at the time of the exception to be \r
-/// reported with the exception. The format and contents of the context data varies depending on the \r
-/// processor architecture. \r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data.  \r
-  ///\r
-  EFI_STATUS_CODE_DATA                  DataHeader;\r
-  ///\r
-  /// The system context. \r
-  ///\r
-  EFI_STATUS_CODE_EXCEP_SYSTEM_CONTEXT  Context;\r
-} EFI_STATUS_CODE_EXCEP_EXTENDED_DATA;\r
-\r
-///\r
-/// This extended data records information about a Start() function call. Start() is a member of \r
-/// the EFI 1.10 Driver Binding Protocol.\r
-///\r
-typedef struct {\r
-  /// \r
-  /// The data header identifying the data.  \r
-  ///\r
-  EFI_STATUS_CODE_DATA           DataHeader;\r
-  ///\r
-  /// The controller handle. \r
-  ///\r
-  EFI_HANDLE                     ControllerHandle;\r
-  ///\r
-  /// The driver binding handle.\r
-  ///\r
-  EFI_HANDLE                     DriverBindingHandle;\r
-  /// \r
-  /// The size of the RemainingDevicePath. It is zero if the Start() function is \r
-  /// called with RemainingDevicePath = NULL. \r
-  ///\r
-  UINT16                         DevicePathSize;\r
-  ///\r
-  /// Matches the RemainingDevicePath parameter being passed to the Start() \r
-  /// function. Note that this parameter is the variable-length device path and not a pointer \r
-  /// to the device path.\r
-  ///  \r
-  UINT8                          *RemainingDevicePath;\r
-} EFI_STATUS_CODE_START_EXTENDED_DATA;\r
-\r
-///\r
-/// Legacy Oprom extended data\r
-/// The device handle and ROM image base can be used by consumers to determine which option \r
-/// ROM failed. Due to the black-box nature of legacy option ROMs, the amount of information that \r
-/// can be obtained may be limited.\r
-///\r
-typedef struct {\r
-  ///\r
-  /// The data header identifying the data.\r
-  ///\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  ///\r
-  /// The handle corresponding to the device that this legacy option ROM is being invoked.\r
-  ///\r
-  EFI_HANDLE            DeviceHandle;\r
-  ///\r
-  /// The base address of the shadowed legacy ROM image.  \r
-  /// May or may not point to the shadow RAM area. \r
-  ///\r
-  EFI_PHYSICAL_ADDRESS  RomImageBase;\r
-} EFI_LEGACY_OPROM_EXTENDED_DATA;\r
-\r
-#pragma pack()\r
-\r
-extern EFI_GUID gEfiStatusCodeSpecificDataGuid;\r
-\r
-//\r
-// EFI_COMPUTING_UNIT_MISMATCH_ATTRIBUTES\r
-// All other attributes are reserved for future use and\r
-// must be initialized to 0.\r
-//\r
-#define EFI_COMPUTING_UNIT_MISMATCH_SPEED       0x0001\r
-#define EFI_COMPUTING_UNIT_MISMATCH_FSB_SPEED   0x0002\r
-#define EFI_COMPUTING_UNIT_MISMATCH_FAMILY      0x0004\r
-#define EFI_COMPUTING_UNIT_MISMATCH_MODEL       0x0008\r
-#define EFI_COMPUTING_UNIT_MISMATCH_STEPPING    0x0010\r
-#define EFI_COMPUTING_UNIT_MISMATCH_CACHE_SIZE  0x0020\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM1        0x1000\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM2        0x2000\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM3        0x4000\r
-#define EFI_COMPUTING_UNIT_MISMATCH_OEM4        0x8000\r
-\r
-\r
-\r
-//\r
-// Memory Error Granularities\r
-//\r
-#define EFI_MEMORY_ERROR_OTHER      0x01\r
-#define EFI_MEMORY_ERROR_UNKNOWN    0x02\r
-#define EFI_MEMORY_ERROR_DEVICE     0x03\r
-#define EFI_MEMORY_ERROR_PARTITION  0x04\r
-\r
-//\r
-// Memory Error Operations\r
-//\r
-#define EFI_MEMORY_OPERATION_OTHER          0x01\r
-#define EFI_MEMORY_OPERATION_UNKNOWN        0x02\r
-#define EFI_MEMORY_OPERATION_READ           0x03\r
-#define EFI_MEMORY_OPERATION_WRITE          0x04\r
-#define EFI_MEMORY_OPERATION_PARTIAL_WRITE  0x05\r
-\r
-//\r
-// Define shorthands to describe Group Operations\r
-// Many memory init operations are essentially group\r
-// operations.\r
-\r
-/// A shorthand to describe that the operation is performed\r
-/// on multiple devices within the array\r
-///\r
-#define EFI_MULTIPLE_MEMORY_DEVICE_OPERATION  0xfffe\r
-///\r
-/// A shorthand to describe that the operation is performed on all devices within the array\r
-///\r
-#define EFI_ALL_MEMORY_DEVICE_OPERATION 0xffff\r
-///\r
-/// A shorthand to describe that the operation is performed on multiple arrays\r
-///\r
-#define EFI_MULTIPLE_MEMORY_ARRAY_OPERATION 0xfffe\r
-///\r
-/// A shorthand to describe that the operation is performed on all the arrays\r
-///\r
-#define EFI_ALL_MEMORY_ARRAY_OPERATION  0xffff\r
-\r
-#endif\r

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index b3448bda73d2e81fe3d8777f02e7886da8701768..dff8e1a4f6a4112d524cd6586d3374da9f88e1ea 100644 (file)
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -50,12 +50,6 @@
   ## Include/Guid/SmmCommunicate.h\r
   gSmmCommunicateHeaderGuid      = { 0xf328e36c, 0x23b6, 0x4a95, { 0x85, 0x4b, 0x32, 0xe1, 0x95, 0x34, 0xcd, 0x75 }}\r
   \r
   ## Include/Guid/SmmCommunicate.h\r
   gSmmCommunicateHeaderGuid      = { 0xf328e36c, 0x23b6, 0x4a95, { 0x85, 0x4b, 0x32, 0xe1, 0x95, 0x34, 0xcd, 0x75 }}\r
   \r

-  ## Include/Guid/StatusCodeDataTypeId.h\r
-  gEfiStatusCodeDataTypeStringGuid = { 0x92D11080, 0x496F, 0x4D95, { 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A }}\r
-  \r
-  ## Include/Guid/StatusCodeDataTypeId.h\r
-  gEfiStatusCodeSpecificDataGuid   = { 0x335984BD, 0xE805, 0x409A, { 0xB8, 0xF8, 0xD2, 0x7E, 0xCE, 0x5F, 0xF7, 0xA6 }}\r
-\r

   ## Include/Guid/FirmwareFileSystem.h\r
   gEfiFirmwareFileSystemGuid     = { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}\r
 \r
   ## Include/Guid/FirmwareFileSystem.h\r
   gEfiFirmwareFileSystemGuid     = { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}\r
 \r