Corrected a small bugs:

The macro name generated in autogen should match that in the Service.h.

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index bfeb81db7143c06f4898c5df2e9381b5c8560875..8796affeb2ec73e22aa131c55b10652de4de45ea 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -22,13 +22,13 @@ Module Name: Service.h
 // Please make sure the PCD Serivce PEIM Version is consistent with\r
 // the version of PCD Database generation tool\r
 //\r
 // Please make sure the PCD Serivce PEIM Version is consistent with\r
 // the version of PCD Database generation tool\r
 //\r

-#define PCD_DXE_SERVICE_DRIVER_VERSION      2\r
+#define PCD_SERVICE_DXE_DRIVER_VERSION      2\r

 \r
 //\r
 // PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h\r
 // and generated by PCD Database generation tool.\r
 //\r
 \r
 //\r
 // PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h\r
 // and generated by PCD Database generation tool.\r
 //\r

-#if (PCD_DXE_SERVICE_PEIM_VERSION != PCD_DXE_DATABASE_GENTOOL_VERSION)\r
+#if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION)\r

   #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"\r
 #endif\r
 \r
   #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"\r
 #endif\r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h
index 39737acb8350b6662cfb61cc8012c4f304e399b4..674197b0cf06109a56c0bc64f663054270c47634 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.h
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.h
@@ -22,13 +22,13 @@ Module Name: Service.h
 // Please make sure the PCD Serivce PEIM Version is consistent with\r
 // the version of PCD Database generation tool\r
 //\r
 // Please make sure the PCD Serivce PEIM Version is consistent with\r
 // the version of PCD Database generation tool\r
 //\r

-#define PCD_PEI_SERVICE_DRIVER_VERSION      2\r
+#define PCD_SERVICE_PEIM_VERSION      2\r

 \r
 //\r
 // PCD_PEI_DATABASE_GENTOOL_VERSION is defined in Autogen.h\r
 // and generated by PCD Database generation tool.\r
 //\r
 \r
 //\r
 // PCD_PEI_DATABASE_GENTOOL_VERSION is defined in Autogen.h\r
 // and generated by PCD Database generation tool.\r
 //\r

-#if (PCD_PEI_SERVICE_PEIM_VERSION != PCD_PEI_DATABASE_GENTOOL_VERSION)\r
+#if (PCD_SERVICE_PEIM_VERSION != PCD_PEI_SERVICE_DRIVER_AUTOGEN_VERSION )\r

   #error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches"\r
 #endif\r
 \r
   #error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches"\r
 #endif\r
 \r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
index e03317b633a8a1594b069883c0828a2b11b35dc3..d848d1f561df629458ecec41af13d9da5fa0baa2 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/pcd/action/PcdDatabase.java
@@ -1205,7 +1205,7 @@ public class PcdDatabase {
         hString += result.get("initDeclStr");\r
         hString += result.get("uninitDeclStr");\r
 \r
         hString += result.get("initDeclStr");\r
         hString += result.get("uninitDeclStr");\r
 \r

-        hString += String.format("#define PCD_%s_SERVICE_DRIVER_VERSION         %d", phase, version);\r
+        hString += String.format("#define PCD_%s_SERVICE_DRIVER_AUTOGEN_VERSION         %d", phase, version);\r

 \r
         cString = newLine + newLine + result.get("initInstStr");\r
 \r
 \r
         cString = newLine + newLine + result.get("initInstStr");\r
 \r