From dbdaaec45c275b244266c57a024d9296debfe268 Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 24 May 2006 08:13:32 +0000
Subject: [PATCH] 1) Fix bug reported on the PcdSetEx* Macro. 2) Add SKU_ID
 type

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@252 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdePkg/Include/Library/PcdLib.h        | 12 ++++++------
 MdePkg/Include/Ppi/Pcd.h               |  2 ++
 MdePkg/Include/Protocol/Pcd.h          |  2 ++
 MdePkg/Library/DxePcdLib/DxePcdLib.msa |  5 ++++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h
index 1375e0039f..631aa40025 100644
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -92,12 +92,12 @@ Module Name: PcdLib.h
 //
 // Dynamic Set Ex
 //
-#define PcdSetEx8   (Guid, TokenName, Value)      LibPcdSetEx8   (Guid, _PCD_TOKEN_##TokenName, Value)
-#define PcdSetEx16  (Guid, TokenName, Value)      LibPcdSetEx16  (Guid, _PCD_TOKEN_##TokenName, Value)
-#define PcdSetEx32  (Guid, TokenName, Value)      LibPcdSetEx32  (Guid, _PCD_TOKEN_##TokenName, Value)
-#define PcdSetEx64  (Guid, TokenName, Value)      LibPcdSetEx64  (Guid, _PCD_TOKEN_##TokenName, Value)
-#define PcdSetExPtr (Guid, TokenName, Value)      LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, Value)
-#define PcdSetExBool(Guid, TokenName, Value)      LibPcdSetExBool(Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetEx8(Guid, TokenName, Value)      LibPcdSetEx8   (Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetEx16(Guid, TokenName, Value)     LibPcdSetEx16  (Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetEx32(Guid, TokenName, Value)     LibPcdSetEx32  (Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetEx64(Guid, TokenName, Value)     LibPcdSetEx64  (Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetExPtr(Guid, TokenName, Value)    LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetExBool(Guid, TokenName, Value)   LibPcdSetExBool(Guid, _PCD_TOKEN_##TokenName, Value)
 
 
 /**
diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index 2b968f0d80..8027375384 100644
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -22,6 +22,8 @@ extern EFI_GUID gPcdPpiGuid;
 #define PCD_PPI_GUID \
   { 0x632df884, 0x8023, 0x4872, { 0xb6, 0x70, 0xb7, 0x4a, 0x30, 0x19, 0x16, 0xe9 } }
 
+typedef UINT8   SKU_ID;
+
 typedef 
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_SKU) (
diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index 880ae425b0..ccdfd13647 100644
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -22,6 +22,8 @@ extern EFI_GUID gPcdProtocolGuid;
 #define PCD_PROTOCOL_GUID \
   { 0x11b34006, 0xd85b, 0x4d0a, { 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0xe, 0xf7 } }
 
+typedef UINT8   SKU_ID;
+
 typedef 
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_SKU) (
diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.msa b/MdePkg/Library/DxePcdLib/DxePcdLib.msa
index dd7cbcee09..9cfd4a746e 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.msa
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.msa
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -42,6 +42,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>
     <PackageName>MdePkg</PackageName>
   </Includes>
+  <Protocols>
+    <Protocol Usage="ALWAYS_CONSUMED">Pcd</Protocol>
+  </Protocols>
   <Externs>
     <Extern>
       <Constructor>PcdLibConstructor</Constructor>