[edk2-devel] [PATCH 6/7] MdePkg: Consolidate revision macros

[edk2-devel] [PATCH 6/7] MdePkg: Consolidate revision macros

[Sachin Ganesh via groups.io]

Revision macros of PEI/DXE/MM specifications have been consolidated to a single PI macro

Cc: Felix Polyudov <felixp@ami.com>
Cc: Dhanaraj V <vdhanaraj@ami.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Sachin Ganesh <sachinganesh@ami.com>
---
 MdePkg/Include/Pi/PiDxeCis.h     | 4 ++--
 MdePkg/Include/Pi/PiMmCis.h      | 6 +++---
 MdePkg/Include/Pi/PiMultiPhase.h | 6 ++++++
 MdePkg/Include/Pi/PiPeiCis.h     | 4 ++--
 MdePkg/Include/Pi/PiSmmCis.h     | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 04410c5a1a..226b6e20a4 100644
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -691,8 +691,8 @@ EFI_STATUS
 // DXE Services Table

 //

 #define DXE_SERVICES_SIGNATURE            0x565245535f455844ULL

-#define DXE_SPECIFICATION_MAJOR_REVISION  1

-#define DXE_SPECIFICATION_MINOR_REVISION  70

+#define DXE_SPECIFICATION_MAJOR_REVISION  PI_SPECIFICATION_MAJOR_REVISION

+#define DXE_SPECIFICATION_MINOR_REVISION  PI_SPECIFICATION_MINOR_REVISION

 #define DXE_SERVICES_REVISION             ((DXE_SPECIFICATION_MAJOR_REVISION<<16) | (DXE_SPECIFICATION_MINOR_REVISION))



 typedef struct {

diff --git a/MdePkg/Include/Pi/PiMmCis.h b/MdePkg/Include/Pi/PiMmCis.h
index 01340952d8..7a9f151e59 100644
--- a/MdePkg/Include/Pi/PiMmCis.h
+++ b/MdePkg/Include/Pi/PiMmCis.h
@@ -20,10 +20,10 @@ typedef struct _EFI_MM_SYSTEM_TABLE EFI_MM_SYSTEM_TABLE;
 ///

 #define MM_MMST_SIGNATURE  SIGNATURE_32 ('S', 'M', 'S', 'T')

 ///

-/// The Management Mode System Table (MMST) revision is 1.6

+/// The Management Mode System Table (MMST) revision

 ///

-#define MM_SPECIFICATION_MAJOR_REVISION  1

-#define MM_SPECIFICATION_MINOR_REVISION  60

+#define MM_SPECIFICATION_MAJOR_REVISION  PI_SPECIFICATION_MAJOR_REVISION

+#define MM_SPECIFICATION_MINOR_REVISION  PI_SPECIFICATION_MINOR_REVISION

 #define EFI_MM_SYSTEM_TABLE_REVISION     ((MM_SPECIFICATION_MAJOR_REVISION<<16) | (MM_SPECIFICATION_MINOR_REVISION))



 /**

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index a7e95820ef..681662b76c 100644
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -20,6 +20,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Pi/PiStatusCode.h>

 #include <Pi/PiS3BootScript.h>



+//

+// PI Specification Revision information

+//

+#define PI_SPECIFICATION_MAJOR_REVISION  1

+#define PI_SPECIFICATION_MINOR_REVISION  70

+

 /**

   Produces an error code in the range reserved for use by the Platform Initialization

   Architecture Specification.

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index 69eec2c473..c65df9378e 100644
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -846,8 +846,8 @@ EFI_STATUS
 //

 // PEI Specification Revision information

 //

-#define PEI_SPECIFICATION_MAJOR_REVISION  1

-#define PEI_SPECIFICATION_MINOR_REVISION  70

+#define PEI_SPECIFICATION_MAJOR_REVISION  PI_SPECIFICATION_MAJOR_REVISION

+#define PEI_SPECIFICATION_MINOR_REVISION  PI_SPECIFICATION_MINOR_REVISION

 ///

 /// Specification inconsistency here:

 /// In the PI1.0 spec, PEI_SERVICES_SIGNATURE is defined as 0x5652455320494550. But

diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index bf5b580c32..886b5e4a38 100644
--- a/MdePkg/Include/Pi/PiSmmCis.h
+++ b/MdePkg/Include/Pi/PiSmmCis.h
@@ -15,7 +15,7 @@


 typedef struct _EFI_SMM_SYSTEM_TABLE2 EFI_SMM_SYSTEM_TABLE2;

 //

-// Define new MM related definition introduced by PI 1.5.

+// MM related definitions

 //

 #define  SMM_SMST_SIGNATURE                MM_MMST_SIGNATURE

 #define  SMM_SPECIFICATION_MAJOR_REVISION  MM_SPECIFICATION_MAJOR_REVISION

--
2.24.1.windows.2
-The information contained in this message may be confidential and proprietary to American Megatrends (AMI). This communication is intended to be read only by the individual or entity to whom it is addressed or by their designee. If the reader of this message is not the intended recipient, you are on notice that any distribution of this message, in any form, is strictly prohibited. Please promptly notify the sender by reply e-mail or by telephone at 770-246-8600, and then delete or destroy all copies of the transmission.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#118246): https://edk2.groups.io/g/devel/message/118246
Mute This Topic: https://groups.io/mt/105721897/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-